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

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

Change-Id: Iae04c321f57e33019861ebf60ea29256b0d63e29
---

883d667c42c55e757e653d01fccd4160704657d5