tree 4b85a8b4834ce1de20379da2c228aff7dfe61b0a
parent 77cf463c09662a999d6d9a667a1d1313bd08b225
parent 09f842b03d8f9c0ab5e4541937f8061a7d1bf53d
author Andreas Huber <andih@google.com> 1367529591 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367529591 -0700

am 09f842b0: Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev

* commit '09f842b03d8f9c0ab5e4541937f8061a7d1bf53d':
  The software FLAC encoder now properly signals an error if client