OSDN Git Service

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

Change-Id: Ic22415e166e94e9a1d3301557b8fe36afce9d29f


Trivial merge