tree 49ee7ab733fab5a2f0abdea7f1433da785381db1
parent e261ea2195223ca989d0505204074fd17ba4a2ff
parent b33c0eb07a2517dce07dc8f04d233eafc1cae5a8
author Andy Hung <hunga@google.com> 1495124801 +0000
committer android-build-merger <android-build-merger@google.com> 1495124801 +0000

Merge "VolumeShaper: Enable xOffset from Java" into oc-dev
am: b33c0eb07a

Change-Id: Icc37873492d612a66484d731168de5c5e27213c9