OSDN Git Service

Merge "VolumeShaper: Enable xOffset from Java" into oc-dev am: b33c0eb07a
authorAndy Hung <hunga@google.com>
Thu, 18 May 2017 16:34:39 +0000 (16:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 16:34:39 +0000 (16:34 +0000)
am: 0cc01b5bc2

Change-Id: I9afcd844391b56991b5cc686808f89b4ec878a31


Trivial merge