tree 09b9b21af72d3ec57979d8cde93c63b72e2db7cc
parent d49960f16b81f4a2ef665b201fa026cdfffce992
parent c284057bd4400cf2a7ae6d859a69be35b31fabb7
author Jean-Baptiste Queru <jbq@google.com> 1330559483 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330559483 -0800

am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5

* commit '4f9063622415ea083bbd639af06e98065ce7176d':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction