| commit | 920f3d885ad35caa6c3ed83a1c9f71c21903e1b5 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 13:08:40 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 13:08:40 2009 -0700 |
| tree | e72cd4d92c95c1933c8c4f8f57eee6fb45bc133c | |
| parent | 918428162f5e6dca4015bcc778c91837fad330dd [diff] | |
| parent | ec1ddffd0a124773a39ad1a1fb2a638fb6b251ec [diff] |
resolved conflicts for merge of 6ba69734 to eclair, skipping preloaded-classes as pre Bob