From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Wed, 12 Apr 2017 16:00:45 +0000 (+0000)
Subject: Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev am: 170e3e242b
X-Git-Tag: android-x86-8.1-r1~1274^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ea65fc90f3868d8734d32ee23e1ab702a2167050;p=android-x86%2Fframeworks-base.git

Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev am: 170e3e242b
am: 163cdf2fb5

Change-Id: If40faebdb11c9ffe6648b22b43bede52ee6bfeec
---

ea65fc90f3868d8734d32ee23e1ab702a2167050