tree dc806b9af5731fadff411f516c34225ad242f28c
parent 41087f7920196f81a50f320c9d538b36534f178d
parent aa86aa60dc5d89caf7d7edc545bc96fa133d64e8
author Jean-Baptiste Queru <jbq@google.com> 1330102410 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330102410 -0800

am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"

* commit 'aa86aa60dc5d89caf7d7edc545bc96fa133d64e8':
  stagefright aacenc: Fix inline asm