tree bb024e045c53ef9fc1916b1ca57489e50c3287fb
parent 18ebc4301f0a97c6e68054ccfe364e3b997a1501
parent c1f00b916fd4a04ebcdfc86b243dddfecbacb878
author Jaewan Kim <jaewan@google.com> 1474593400 +0000
committer android-build-merger <android-build-merger@google.com> 1474593400 +0000

Merge "Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059  -s ours am: 5ac79fa0a1  -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce  -s ours am: 1c278e5652 am: bed7636243 am: dd883c7e87 am: 832179120f  -s ours am: c547eeda12" into nyc-dev-plus-aosp am: 3434f0f59e
am: c1f00b916f  -s ours

Change-Id: I1e47962a654c3b43b312dda7e7df8ac13472b9e0