| commit | 044cc414d21ad32e5d963e3b66c37f3272b072f6 | [log] [tgz] |
|---|---|---|
| author | Jaewan Kim <jaewan@google.com> | Fri Sep 23 00:06:23 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 23 00:06:23 2016 +0000 |
| tree | 321edd09e507c40d8461ff7a180fb595f1ecabc1 | |
| parent | 2cfbc8e56cae15fa9953cf6e4a23dc2b2c8d71ec [diff] | |
| parent | e0bd191caf7ad0eaea0fe901e289fa3933a5eade [diff] |
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 am: f91952879c" into nyc-mr1-dev am: 9570466f2d am: e0bd191caf Change-Id: Ie28505a973cb6e6a17b43ba45b7eaeb4ad673a25