commit | c547eeda12cfce93bac34c245f767f52bcde1a4d | [log] [tgz] |
---|---|---|
author | Jaewan Kim <jaewan@google.com> | Thu Sep 22 20:35:00 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 22 20:35:00 2016 +0000 |
tree | 11cb819a72c07ee7b342f72f247752a9748ddd28 | |
parent | 36068a2f00147d6f574a4ec9009550af5ee10bcd [diff] | |
parent | 832179120fbf45d0dfe7490ef17f9338c8b01798 [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 am: 832179120f -s ours Change-Id: Iefcfa52c1a34b05102c7188b3e7232584cffba53