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 20:43:33 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 20:43:33 +0000 (20:43 +0000)
commit3babfefdb4e236c77b6d574a07807dfa10e02bef
treef12f98495931e99718530ea3d6c281a0b5e03a97
parentfdad028484f320121db35250154a1772cc4504c4
parent3e2f3c2e3136f037f63dc525563b2d44c5613b3c
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 am: 83ded12e86
am: 3e2f3c2e31

Change-Id: I75a62471c3c975b6af6cf5364fa59beda442e9df