| commit | 6b54348cfb7b8575c1221f79a1bd512136675df0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 30 12:13:43 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 30 12:13:43 2010 -0700 |
| tree | f1548891fab33ca03923f70cf25a2ffeab50be82 | |
| parent | db0e4136c3d09c9df4ddf8258ee5c98c053ffba4 [diff] | |
| parent | 9da2070b6d6d20550de7da61478c325f0928d020 [diff] |
am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread Merge commit '154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp * commit '154a320069a316491c25b716f2aeea8c51a758e8': fix inaccurate copyrights