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:35:13 +0000 (12:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 12:35:13 +0000 (12:35 +0000)
commit8c53db264ae58c599afce42b432cba2543bad329
tree02b4b2a4fcf05777247dd30b937c26d0674a8191
parent6f6b07c9c739915047ca74aa096195116c3b96fb
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: If9db6d86109457a4ab06b69eb7c1db35ef823127