OSDN Git Service

Merge "DO NOT MERGE Check caller for sending media key to global priority session...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 22 Sep 2016 20:41:54 +0000 (20:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Sep 2016 20:41:56 +0000 (20:41 +0000)
commitb380c545d287618f64acb2b47b924f52a5a2906e
treeec59e17215012aabd157aaa6ecce6448506936f2
parent04f7418362af40aed53feb577f76aaaf4d8036ad
parentaa3262bde4d786a241b6eea8b4f41f35c23c95bf
Merge "DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7 am: 35e95d82d7  -s ours am: 2ccdbce954 am: aff8ee6351" into nyc-mr1-dev-plus-aosp