| commit | d38faa28eb767a108a7a9467c1a481957531d2af | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Feb 24 09:52:54 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 24 09:52:54 2012 -0800 |
| tree | 9d39bc688b148c31a70b3bd6c43e87999690fb63 | |
| parent | b20a352b7e4eb6690e86e0dcf9d58d73640dc874 [diff] | |
| parent | 142ce9a65b7505819e1205ad5bfa5d63843c7f43 [diff] |
am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" * commit '4de803c76d4afd0f542c086b555b71729b3c5796': stagefright aacenc: Avoid warnings about incompatible pointer types