| commit | d6b15d3d101b2fb253895e611e081c82afe6d9e2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 27 13:15:10 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 27 13:15:10 2012 -0800 |
| tree | 72a298620bb8959da5243a5dea2d3d15fc644f05 | |
| parent | 7b65e71b662ce3bd7983fbfb62e8dafade5ccc55 [diff] | |
| parent | 67caa6dfef0b98235616102eb5c503f84782bbed [diff] |
am 5ba910d8: am 040c5b2c: am ded8e681: am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" * commit '5ba910d867d029e69c4f52667c02a4c114f849df': stagefright amrwb: Change a C++ style cast into a C style cast