tree fa55f8db0ff1e9ec0f9974e6055aa7dda0b9ae4c
parent c58295bfa07615b81b9bf5784cb8e2dac79aded7
parent 6dfeab4ddf3fcb82483f29d146329aa959fc0c82
author Jean-Baptiste Queru <jbq@google.com> 1330098823 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330098823 -0800

am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"

* commit 'bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
  stagefright aacenc: Fix inline asm constraints