| commit | 64c6b9d42196cc2ac89a6d74f2a2ea160c14432e | [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 | ff61c89a6202ad1ad7244fc8249c436cd660741a | |
| parent | 999a700730d1f49a10bdf6b2c56c675ff24cb127 [diff] | |
| parent | afe1786ba1d4ad02ef3c585568c188f2090a6310 [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