tree bc08b9131a0c7133b525cc53d48831adbee91f4f
parent 29b0600838a9945258e8db141db17f32ea432c62
parent df2298ad3206a390ebbdaf26e15da94acdd2daff
author Wonsik Kim <wonsik@google.com> 1487260897 +0000
committer android-build-merger <android-build-merger@google.com> 1487260897 +0000

Merge "DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac  -s ours am: da9246fa5e  -s ours am: 1760d73fbc am: 55d8132edd  -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed  -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 am: e45718e94a am: a9cfe53698" into nyc-mr2-dev-plus-aosp
am: df2298ad32  -s ours

Change-Id: Iac68a0a3728f7cf9535736b1de7973e7d90c96bf