tree a7e7975f8e11def4253711d61a06bd85bd7ab624
parent 64110c6bf13c23d79d4f5d3dbb72878349a6d14b
parent f7f452fd285ac0a50d2c80d26dbd7f8e70427857
author Jaewan Kim <jaewan@google.com> 1474526463 +0000
committer android-build-merger <android-build-merger@google.com> 1474526463 +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

Change-Id: Iaceb27058be8f06e2e1b0a115ba914f7b0aad7e4