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 12:28:57 +0000 (12:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 12:28:57 +0000 (12:28 +0000)
commitc17a43fcfd01c909dcd4c89a2c0917b209db56e6
tree02b4b2a4fcf05777247dd30b937c26d0674a8191
parentbd25fec0d9f65f74462112a6d1550624a6536beb
parent963c269ffa9729752f27ce195e7b9ec188cad7b2
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261 am: b2403f3102 am: 5decf8e715  -s ours
am: 963c269ffa

Change-Id: I709f55ff1694415af29f11694d74c1564dbe36fc