commit | 9364b5c01efcf4e70766101f947b9642d53cdf11 | [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 | 62ae95e5606b65456e4877a437dfcb3020b7cee1 | |
parent | 0fb6ec284abf024f52cc124b48b993e7115a298f [diff] | |
parent | 0e5f19af0cd9cae3f4ffb22957374334c7b3a4d6 [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