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)
commit228e5b94e35e0fca4c564ea1a5e165937b8be570
tree71da9fb7ed752b20fe5198cee6e7c601d9194786
parent1cc5ca6bdd3b3a7186d9954cfed9b6e9dde277af
parent2c292120aaedf1d70ce6bf8f0c2648fe5b193212
Merge changes from topic "equalizer" am: aad139a2d3  -s ours
am: 2c292120aa  -s ours

Change-Id: I7d40f3964fd312fe645dba2b05cc324fea079321