| commit | c692d2d58930fea02ef29a6a0eede2feda9a5b57 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 23 15:04:28 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 23 15:04:28 2010 -0700 |
| tree | 74e827a66205b81e06083fb0ae18fcde66a2be91 | |
| parent | 9e05ed2f6860a2d34c339a1755dbb5f68081c62e [diff] | |
| parent | 5b0f030d0bfdf7003e74b24da8c4379c74447380 [diff] |
am 5b0f030d: resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp Merge commit '5b0f030d0bfdf7003e74b24da8c4379c74447380' * commit '5b0f030d0bfdf7003e74b24da8c4379c74447380': Remove compilation warnings by removing illegal characters