RoboErik 8fb4cf1ef4 Merge "Move Session apis to android.media.session"

2014-02-26 18:13:35 +00:00

..

java/android

Merge "Move Session apis to android.media.session"

2014-02-26 18:13:35 +00:00

jni

Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."

2014-02-13 17:22:33 +00:00

lib

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

mca

Resolved conflicts for merge of 28c6ec02 to master

2014-01-16 15:49:59 +00:00

tests

Merge "Tabs -> spaces in frameworks/base."

2014-02-25 19:57:33 +00:00