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 13:57:14 +0000 (13:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 13:57:14 +0000 (13:57 +0000)
commitc56cabef9d075c0bb516abbfb2d12f4583dc8681
tree9ca814f46f38ff1af99ec80d4441d4a65f028775
parent091681149b80ef13de4e3d06e651f3fc7a73114f
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: Ife5fa9fb43fb28eb8e71a7707c846c58d18478b4