| commit | 3768ac8b7a7713c2dd1b7cdc70ddf760003d5e53 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 30 12:15:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 30 12:15:42 2010 -0700 |
| tree | 724fcd5e396f08b9f50ca318cff643cdb8b8d407 | |
| parent | d904b49e5ac83cb3000a01eb97771731aa1fbe43 [diff] | |
| parent | 6b54348cfb7b8575c1221f79a1bd512136675df0 [diff] |
am 6a5ed6aa: am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread Merge commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7' * commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7': fix inaccurate copyrights