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
This commit is contained in:
Jaewan Kim
2016-09-23 01:16:40 +00:00
committed by android-build-merger

Diff Content Not Available