| commit | 6c75f0d20ef5ade654dc32eae196b6d212e9d353 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Nov 04 10:57:41 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 04 10:57:41 2010 -0700 |
| tree | c0789b80607a28ebd31c0528c6033d824e19900b | |
| parent | 439e88e7d09bfeac4690f2d9df6533955aa4fa88 [diff] | |
| parent | 1c376985dd7602cd3542714b7eb46a5198270658 [diff] |
am 1c376985: Merge 59fa028a from open-source master * commit '1c376985dd7602cd3542714b7eb46a5198270658': Fix compilation error: invalid conversion from 'const char*' to 'char*'.