OSDN Git Service

Merge "DO NOT MERGE Check caller for sending media key to telephony service" into...
authorJaewan Kim <jaewan@google.com>
Thu, 22 Sep 2016 09:13:35 +0000 (09:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 09:13:35 +0000 (09:13 +0000)
commit5ac79fa0a1e21259580ab6258269f68c577fa68a
treef212554c8f10cc76cba5b99147f855ea49b7e88c
parent8dffbcd16982ac9aea9eff06da8c21414749349f
parent84ecab6059f43d7eab941cf163c6e7a079b088f6
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894
am: 84ecab6059  -s ours

Change-Id: I077206cbba5614e52046cbbbf6e40544c3e25f92