OSDN Git Service

Merge "Playback activity monitoring: add player types" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 26 May 2017 20:05:48 +0000 (20:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 26 May 2017 20:05:49 +0000 (20:05 +0000)

Trivial merge