OSDN Git Service

am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
authorJean-Baptiste Queru <jbq@google.com>
Wed, 29 Feb 2012 23:47:35 +0000 (15:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Feb 2012 23:47:35 +0000 (15:47 -0800)
commitc284057bd4400cf2a7ae6d859a69be35b31fabb7
tree09b9b21af72d3ec57979d8cde93c63b72e2db7cc
parent6a0321714bfc3834425ee731a4f0c82a1cb4a167
parent82c3852fd544445ed2797931a1af4536802c1db7
am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5

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