| commit | c1f00b916fd4a04ebcdfc86b243dddfecbacb878 | [log] [tgz] |
|---|---|---|
| author | Jaewan Kim <jaewan@google.com> | Thu Sep 22 23:03:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 22 23:03:01 2016 +0000 |
| tree | db191e05fb11123e2f56f668ecd2d7014cbc999f | |
| parent | b22136c400a38d0f1672b7be67c881b4d69cff54 [diff] | |
| parent | 3434f0f59e498f189c3de1df0f6394be64dbf29f [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" into nyc-dev-plus-aosp am: 3434f0f59e Change-Id: I78d873443f769fd4337345d099dabe6500e1a3ab