OSDN Git Service

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

Change-Id: I7d40f3964fd312fe645dba2b05cc324fea079321


Trivial merge