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:34:39 +0000 (16:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 16:34:39 +0000 (16:34 +0000)
commit83ded12e86eaf8cc6c709112ba66fe66a6151f9d
tree9ca814f46f38ff1af99ec80d4441d4a65f028775
parent53adfd62940ebd2a02ca8dec8bfc794bd814e7b8
parent61fda61d208dd411a7ddd4396305c5a531c49287
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 am: 91ccfa1def am: 4167620d33 am: 2c9ad0ff81 am: b6d6519e34  -s ours
am: 61fda61d20

Change-Id: I9159be101773b421df3b23ec02d0f7ec8cb64b4a