commit | 8138b50f3c9243d472042df71b69b8ef05baeed6 | [log] [tgz] |
---|---|---|
author | Jaewan Kim <jaewan@google.com> | Fri Sep 23 00:04:24 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Sep 23 00:04:24 2016 +0000 |
tree | 321edd09e507c40d8461ff7a180fb595f1ecabc1 | |
parent | ecbf83a7cd736a4d6552a1c4e749134f081aaaaa [diff] | |
parent | 7fa39d2a05e21dc57a2ee7f97d93c7459e89d8c3 [diff] |
Merge "DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours am: fa9983ec73 am: 900d1c90b3 am: 0e31d93890 am: 4da22f27f6 -s ours am: 36068a2f00 am: 949c938317" into nyc-mr1-dev am: 02b5a0579b am: 7fa39d2a05 Change-Id: I20eac58cf712ecfa6e36781e90ddbcc305e5c284