tree 108088e1c65c6a011d66dc7dcbfed130c6b741fe
parent 9632afe809f48410f66cb0e432fb3bd98fd293d2
parent 8cb7a9fdb033cd2019ce01dad5038ea2a06c3dbc
author Jaewan Kim <jaewan@google.com> 1474541554 +0000
committer android-build-merger <android-build-merger@google.com> 1474541554 +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 am: d9e8bfb8cf
am: 8cb7a9fdb0

Change-Id: Ib54fc420bb43c312f72f5c72bb38b97550db9da9