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:04:32 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 20:04:32 +0000 (20:04 +0000)
am: 08ca31273c

Change-Id: Id73d3b75067ee95c366816862a8e4bd80cb3d17e


Trivial merge