commit | 3e1ba619fea74b4edd8a1968d95a313b51a4d282 | [log] [tgz] |
---|---|---|
author | Jaewan Kim <jaewan@google.com> | Fri Sep 23 00:36:49 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Sep 23 00:36:49 2016 +0000 |
tree | dcb56acacba81eb9511d6b04be1c6be020446568 | |
parent | 91c7c41a4902ca9eb577c38aa72ff0e37720cb5a [diff] | |
parent | 29c25c03f8efc38fa8a0f6ccf09ad57b4de01b59 [diff] |
Merge "DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861 am: ba1d8300be am: 016d110993 am: 1adff2ee05 -s ours am: 78efad6418 am: 53adfd6294 am: 5886b4ca7b am: fdad028484" into nyc-mr1-dev-plus-aosp am: 29c25c03f8 -s ours Change-Id: I6c63f1f30b0cc360f54e7809b7166446bd5a0ff3