tree 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
parent 57408cc033c6e1d525c63cf11545e768a5aadc76
parent 0827014e5af2e2b006111e2be831968e54e1927a
author Jean-Baptiste Queru <jbq@google.com> 1330108354 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330108354 -0800

am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"

* commit '14c6e2728c2ae39aab6fc9a9a77c402d7322afc0':
  stagefright aacenc: Fix an inline asm constraint