OSDN Git Service

Merge "DO NOT MERGE Check caller for sending media key to global priority session...
authorJaewan Kim <jaewan@google.com>
Thu, 22 Sep 2016 16:37:06 +0000 (16:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 16:37:06 +0000 (16:37 +0000)
commit08ca31273c9a2559928224731f15d5c51b805566
tree9ca814f46f38ff1af99ec80d4441d4a65f028775
parent9b790e27b7a105a8e244eae992860df546b037e6
parent36aa253b2bba79865042a32185adcd7be118a850
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 am: a13096f4c5  -s ours
am: 36aa253b2b

Change-Id: I93fc78c253458ec31b7ea34e34c3124bf7f557b7