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)
commit883d667c42c55e757e653d01fccd4160704657d5
tree7e8ef2cb3a76418b90482d9f496364d55a0baf29
parent362e56e41a847391c02706c170b21a6d1f6c6d68
parent8caf56ef7caf33a602ef0d99afc6469f723fb1eb
Merge "Playback activity monitoring: add player types" into oc-dev
am: 8caf56ef7c

Change-Id: Iae04c321f57e33019861ebf60ea29256b0d63e29