tree 3e6d7b37be4c6d88bae65f86bbc0452fc2b567e3
parent 2d96e2965b3118c4e3cb21a76c9f07e0c8ccfc6e
parent 11484788dd0c2ec9fce29c523a7748de34fb9b8a
author Jean-Baptiste Queru <jbq@google.com> 1327516422 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327516422 -0800

am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"

* commit '95306d85005f165e10a25ad45cadadec6e1f6a31':
  stagefright aacenc: Fix type definitions for 64 bit platforms