| commit | df2298ad3206a390ebbdaf26e15da94acdd2daff | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Feb 16 02:17:13 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 16 02:17:13 2017 +0000 |
| tree | c412d95d295e547cfc3f6acfb016e8fae2e2ed0a | |
| parent | c6ca74dbe3287476f23598a5fb6669febf2136cf [diff] | |
| parent | b2205a825fb7e5246737999a4f62ccc703d9f134 [diff] |
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