OSDN Git Service

Merge changes from topic "equalizer"
authorPeng Xu <pengxu@google.com>
Tue, 26 Sep 2017 11:01:14 +0000 (11:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 11:01:14 +0000 (11:01 +0000)
am: aad139a2d3  -s ours

Change-Id: Id283ea5e7ad3620f9c6488aadcca8bb216aea482


Trivial merge