tree 66e74e2bf726a928180bc65f0385c15dcbc3a118
parent f595add2ff81d6121b0d6628fe8b6966f631a0b8
parent 298c104ae5f5bae831927365f4067ab7fcf119a1
author Jaewan Kim <jaewan@google.com> 1474533958 +0000
committer android-build-merger <android-build-merger@google.com> 1474533958 +0000

Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e  -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d  -s ours
am: 298c104ae5

Change-Id: Id2538e101907fe6a3dc5cb284ecf93a392a047ba