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 03:48:37 +0000 (03:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 03:48:37 +0000 (03:48 +0000)
commit91ccfa1defc0e5f152ec646c74e15998a87f3e57
tree2db764a9415ce0b7161a573dc842de56a951fa3b
parent30d14408610cda0783a6159c05802aeb4db7daaf
parentbea0b3ec06da10cef0ee07b1d2c91a61ea33da4d
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2
am: bea0b3ec06  -s ours

Change-Id: Ic367544242a4034b66f03568eb7d1035f90836dd