tree ee9c08612e7c92446be8e6016e639cf88c58409a
parent 2398607cc73e9870a298f1ab8e895ef3a55d29ba
parent 1ba697e29bb4fd541206d9a1be92edef80b6e43a
author Peng Xu <pengxu@google.com> 1506424048 +0000
committer android-build-merger <android-build-merger@google.com> 1506424048 +0000

Merge changes from topic "equalizer_1"
am: 1ba697e29b

Change-Id: I0b5dabe42c0ab59fab63ea653392dd4d99b7d967