| commit | 11472cedc7f5df8197300107a2f0870f1e34ff1c | [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 | 06c991e1b612a9e6517cefbaf13bd492d125c99f | |
| parent | 1000e383a9ede646706d10ed187d5450d229619e [diff] | |
| parent | 8fb1869d39b6c2579e7fca3c1cbc557cc1faf88d [diff] |
am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread Merge commit '154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp * commit '154a320069a316491c25b716f2aeea8c51a758e8': fix inaccurate copyrights