tree e7511613dd8f804dbb5c0ecb8ca011f8531ac9ed
parent a49c625d95fd3cb325104c6f98201ec2dd2bc75b
parent bcf0f8c10df21fa4cdd001758b9399e336d10ac1
author Android Build Merger (Role) <android-build-merger@google.com> 1468526962 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468526962 +0000

Merge "src/libFLAC/stream_decoder.c : Fix NULL de-reference. am: 83a817d200 am: 5e39e0d829 am: 10c2965d9b am: 1fa69f344f am: 709f40556d am: 1118807bd4 am: 3424de3df7 am: a5a50068aa am: 4ced2ff0bd am: 45d9bab12f am: 2cfe35c5f2 am: 1d930d738f am: fdbb5b06d1" into nyc-mr1-dev-plus-aosp