| commit | ea3db059b0e4f093f417dc4f70ef13a23e7e7160 | [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 | a3487a896595852219292e067fa6a3d9f25abed6 | |
| parent | 59caadae762894c9970c9064b338a5d51798538a [diff] | |
| parent | 13a48cd127c638135de3cc243e94558ebf789b3c [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