OSDN Git Service

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

Change-Id: I7e26c227b8323be39db30bd46b49e54ad3134073


Trivial merge