| commit | 3652dde4e6748dddbb28e94f97a1fc1386fd45c5 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Feb 05 14:09:38 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:09:38 2010 -0800 |
| tree | 5c715b832e38feb06a1fff71c6e5367285f29e6d | |
| parent | 524707aac07a88578f4231925872ec4f282e70fc [diff] | |
| parent | 198052175a6b6de166676925f89439efe86aac0f [diff] |
am 19805217: resolved conflicts for merge of bb2edab6 to eclair-plus-aosp Merge commit '198052175a6b6de166676925f89439efe86aac0f' * commit '198052175a6b6de166676925f89439efe86aac0f': android-2.1_r1 snapshot