commit | bfd99cb8261a8a1ae65dc2e956b5fce8484713bb | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Tue Jan 24 15:15:36 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 24 15:15:36 2012 -0800 |
tree | 223eee889957f99ec648360f20acb678bb752702 | |
parent | f27286d86de720e2b0af9f4facf671f3a5de1d85 [diff] | |
parent | fa521a76c4fc14b01b46930cd0d04856d57fdcc1 [diff] |
am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" * commit '4cd2b343272429adae1fc68e0ec0628c69e88e6d': stagefright amrwbenc: Make the mem_malloc function 64-bit safe