OSDN Git Service

Merge changes from topic "equalizer_1" am: 1ba697e29b
authorPeng Xu <pengxu@google.com>
Tue, 26 Sep 2017 12:17:39 +0000 (12:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 12:17:39 +0000 (12:17 +0000)
am: 46f2249f46

Change-Id: Icd3c715dfed772d05b8314a394aad2725a9937e0


Trivial merge