tree 2a09b810157c2d1e96599bc1da8a25a7098090f1
parent 3125ad9a0a368e481bc3d7fd234d0da4e3af221e
parent b18875e5f775b7a6894f45ca1000e10eb7362edb
author Andy Hung <hunga@google.com> 1463436693 +0000
committer android-build-merger <android-build-merger@google.com> 1463436693 +0000

Merge "DO NOT MERGE Fix AudioEffect reply overflow" into mnc-dev am: e29e934c6e am: a95c6afecb am: a17042b108 am: ba5a77d72a  -s ours
am: b18875e5f7

* commit 'b18875e5f775b7a6894f45ca1000e10eb7362edb':
  DO NOT MERGE Fix AudioEffect reply overflow

Change-Id: I5f0d9906b66e83c5741679fdaa6d5ab9ea1ac735