OSDN Git Service

Merge "Playback activity monitoring: add player types" into oc-dev
authorJean-Michel Trivi <jmtrivi@google.com>
Fri, 26 May 2017 20:09:55 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 May 2017 20:09:55 +0000 (20:09 +0000)
am: 8caf56ef7c

Change-Id: Iae04c321f57e33019861ebf60ea29256b0d63e29


Trivial merge