am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit 'f9d4ba77f45d8f0efe97abb28247cbca12836dca':
  stagefright aacenc: Safeguard against overwriting bits
This commit is contained in:
Jean-Baptiste Queru 2012-02-29 15:47:32 -08:00 committed by Android Git Automerger
commit 6a0321714b

Diff Content Not Available