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 20:35:00 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 20:35:00 +0000 (20:35 +0000)
am: 832179120f  -s ours

Change-Id: Iefcfa52c1a34b05102c7188b3e7232584cffba53


Trivial merge