tree b7ecffc0f46d5d716d8f000d50cebcb15b20a437
parent ba62da99666c9ca590cde49ff00c06d3d50ca0a7
parent f9d4ba77f45d8f0efe97abb28247cbca12836dca
author Jean-Baptiste Queru <jbq@google.com> 1330559252 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330559252 -0800

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

* commit 'f9d4ba77f45d8f0efe97abb28247cbca12836dca':
  stagefright aacenc: Safeguard against overwriting bits