OSDN Git Service

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

Change-Id: I598ed9f0ab7f17944b3eea3107bf058a1a99f917