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

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

Change-Id: I9bbf338a3c3170bd2304637a197c643c8da0a00f
---

d4561d4a902da92967a3d3b0b58c50cbe4a4ec98