| commit | 4015995d47b11b64ec7900a64791e30c4a1f246d | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Sep 22 22:26:41 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 22 22:26:43 2016 +0000 |
| tree | 379fd80a57a4faab52fa52382a74899c2324220a | |
| parent | f7338ac8c27a7fadb0ee8e2789402959568185fd [diff] | |
| parent | 2eea4a662bc7d31dc8836f2c232c623c1e120262 [diff] |
Merge "DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5 am: f595add2ff am: e1e6f0a7f5 am: 9632afe809 -s ours am: b96d410537 am: 9b790e27b7 am: 8d45b4522d am: a7dd993294" into nyc-mr1-dev-plus-aosp