tree 38fd9824f74921b982fdb070e7a1dda92875afdf
parent 42c78f2b9cac682456dada02492d255671a8a6a5
parent fd4847848031c6642c9e47ab9e932de22f7f2972
author Robert Shih <robertshih@google.com> 1427125949 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427125949 +0000

am fd484784: am 39b2a5bb: am 214b9dfa: am fe03f73d: libFLAC: merge master from Xiph

* commit 'fd4847848031c6642c9e47ab9e932de22f7f2972':
  libFLAC: merge master from Xiph