tree f2d27f594c7d1fb912ab82b872a9773a06b743fc
parent b949c894f7f1a65e60641c4b3e4eee767ecca81c
parent bec91884da43a18b688051c779b3ba3f6afe42ae
author Andy Hung <hunga@google.com> 1462320221 +0000
committer android-build-merger <android-build-merger@google.com> 1462320221 +0000

DO NOT MERGE Fix AudioEffect reply overflow am: 7ffa39c454 am: 0dac1009bb am: 02bdc83136  -s ours am: 11018b822f  -s ours am: 5f2bf6a715 am: 6456e25fcb am: 9433877115  -s ours am: 443de3f275 am: 21c641d430 am: b04ee83958 am: 083f301c09  -s ours am: 9e328bc39c
am: bec91884da  -s ours

* commit 'bec91884da43a18b688051c779b3ba3f6afe42ae':

Change-Id: I7559afd20d18e2a93b8a713fc3dad7617fbb8b27