OSDN Git Service

am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
authorJean-Baptiste Queru <jbq@google.com>
Mon, 27 Feb 2012 21:09:57 +0000 (13:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Feb 2012 21:09:57 +0000 (13:09 -0800)
* commit '4f74be57e72cb2fbee05184f5bc00e716d0b95b3':
  stagefright aacenc: Simplify the definition of __inline


Trivial merge