tree 16d3aca62c3f56fc9fe54d71d97670ccec19aaed
parent fa11c5afe52e5773872c116dc9d5e85eefe42d6a
parent 2f8f482ac241f984ee6f48da0d3c9c3c8348bb31
author Android Build Merger (Role) <android-build-merger@google.com> 1487032697 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487032697 +0000

Merge "DO NOT MERGE: Decoder: Fixes an out of bound write in bitstream buffer am: 1f0ab0b089  -s ours am: 4543cf41ad am: f086bb9a89 am: 2b63f25938  -s ours am: 580daabe65 am: 293fbba256 am: 9be100c242 am: 4aab0f9614 am: 7f8e6b9d14" into nyc-mr2-dev-plus-aosp