commit | 832179120fbf45d0dfe7490ef17f9338c8b01798 | [log] [tgz] |
---|---|---|
author | Jaewan Kim <jaewan@google.com> | Thu Sep 22 20:05:57 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 22 20:05:57 2016 +0000 |
tree | 108088e1c65c6a011d66dc7dcbfed130c6b741fe | |
parent | 4da22f27f69734a243391f731a9717bf2d080b95 [diff] | |
parent | dd883c7e87f5e1aab1f3001a272bed16cb6bb158 [diff] |
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 Change-Id: Id9a90d8d49724435fced962b42a89edbb90846c3