tree f5fe8c26eca24674c88df28f57e2d6b8b3d9c78b
parent de99ee3d507bf1284fdb5d6b84a32f4227f16a6f
parent b8576d5ae50294bb1917b84f366054ebff02a3a6
author Jean-Baptiste Queru <jbq@google.com> 1330554292 -0800
committer android code review <noreply-gerritcodereview@google.com> 1330554292 -0800

Merge changes I46c81dba,If1f40e9c,I652eaaa5

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