OSDN Git Service

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

Change-Id: Ifb03e4fbfce459cbe6ad245f3557b2267591cbbc


Trivial merge