| commit | 6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7 | [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 | 1b2b9d421a19c1c3595e6569580adf5f05c5659d | |
| parent | 8e258000e86faa5dd0009caa5823119116ef5dec [diff] | |
| parent | 154a320069a316491c25b716f2aeea8c51a758e8 [diff] |
am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread Merge commit '154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp * commit '154a320069a316491c25b716f2aeea8c51a758e8': fix inaccurate copyrights