commit | d452520464c5a8cdd7a8d0d09b2fdb92cea1eefb | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Jan 25 08:57:36 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 25 08:57:36 2012 -0800 |
tree | f6e0b818fa2178d2b32ca9d87eccc1d1e4b938a0 | |
parent | 28091796a651b19fed6eb291cef041f08d27f886 [diff] | |
parent | e2594b85093441e03150c7cfc540abc626884eaf [diff] |
am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" * commit 'e2594b85093441e03150c7cfc540abc626884eaf': stagefright amrwbenc: Make the mem_malloc function 64-bit safe