tree 840877d4db69fb29d50af40955db2ee34625b5d8
parent 9c6fba5f6e187592d1bb4623ebceb834626a868d
parent c690cad78f2e3d6791c28d305b234570fab7b209
author Erik de Castro Lopo <erikd@mega-nerd.com> 1468527468 +0000
committer android-build-merger <android-build-merger@google.com> 1468527468 +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
am: c690cad78f

Change-Id: Ib27cc1c846a391c9d5215d81aec30f68d543cb0e