OSDN Git Service

Merge "Initial round of MediaSession APIs"
authorRoboErik <epastern@google.com>
Thu, 20 Feb 2014 00:25:10 +0000 (00:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 20 Feb 2014 00:25:10 +0000 (00:25 +0000)
1  2 
Android.mk
api/current.txt
services/java/com/android/server/SystemServer.java

diff --cc Android.mk
Simple merge
diff --cc api/current.txt
Simple merge