| commit | 2cfbc8e56cae15fa9953cf6e4a23dc2b2c8d71ec | [log] [tgz] |
|---|---|---|
| author | Jaewan Kim <jaewan@google.com> | Fri Sep 23 00:05:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 23 00:05:17 2016 +0000 |
| tree | 321edd09e507c40d8461ff7a180fb595f1ecabc1 | |
| parent | 8138b50f3c9243d472042df71b69b8ef05baeed6 [diff] | |
| parent | 1efb02564f9815c68af38ed06ba29d0c1fddeab3 [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 am: c547eeda12 am: f91952879c am: dcbae98c53 am: 1efb02564f Change-Id: I972d8fcb51e964c2e92b3caa9573c17e2f56c4ef