From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Fri, 26 May 2017 18:13:38 +0000 (+0000)
Subject: Merge "Playback activity monitoring: add player types" into oc-dev
X-Git-Tag: android-x86-9.0-r1~3069^2~232
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a4f967471b49fff46140c85ebe44a8736463de02;p=android-x86%2Fframeworks-base.git

Merge "Playback activity monitoring: add player types" into oc-dev
am: faa2cdfa47

Change-Id: Ic22415e166e94e9a1d3301557b8fe36afce9d29f
---

a4f967471b49fff46140c85ebe44a8736463de02