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:33:02 +0000 (12:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 12:33:02 +0000 (12:33 +0000)
commitdd463873b115fbab22b53ac3a4c862d7bdc700e6
treee4a07f998a581294d02c32561fac6dcf3c310569
parenta5392a56e53bbb58e68b25220439833c6cbf79b5
parent228e5b94e35e0fca4c564ea1a5e165937b8be570
Merge changes from topic "equalizer" am: aad139a2d3  -s ours am: 2c292120aa  -s ours
am: 228e5b94e3

Change-Id: I480f3645c89dbd44117f18a5807f8aea753439ab