OSDN Git Service

resolve merge conflicts of 5b6c034 to stage-aosp-master
authorJae Seo <jaeseo@google.com>
Wed, 6 Jul 2016 07:45:15 +0000 (00:45 -0700)
committerJae Seo <jaeseo@google.com>
Wed, 6 Jul 2016 07:45:15 +0000 (00:45 -0700)
commit5f5bd8848c3374e6429a82840573526c637fffc7
treeeca5d2e70f1c737ac8e5a833c44c1e8ad2ba84c2
parent9ede567f7caa0171fa6106d097f6a06a0646820c
parent5b6c03415c0ceb3f7f8b9022ccdab0f1d479616e
resolve merge conflicts of 5b6c034 to stage-aosp-master

Change-Id: I664240e9a9b2693f912b5b2a8a1731d08f109bfe
services/core/java/com/android/server/media/MediaSessionService.java