From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Tue, 25 Apr 2017 15:51:51 +0000 (+0000)
Subject: Merge "VolumeShaper: API change for duration" into oc-dev am: 44515357ce
X-Git-Tag: android-x86-8.1-r1~550
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2efc369373cf3369574c4c24d31cb9b06976ba7e;p=android-x86%2Fframeworks-base.git

Merge "VolumeShaper: API change for duration" into oc-dev am: 44515357ce
am: d4561d4a90

Change-Id: Ieac8c4ff551537534eec88076d92557b90a052d9
---

2efc369373cf3369574c4c24d31cb9b06976ba7e