| commit | 46e88304f42d338b8fc379c3b5d032b70c2eb045 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Feb 02 17:15:35 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 02 17:15:35 2011 -0800 |
| tree | 1e3b973274175e4c02501052b1c38a43d84ea786 | |
| parent | dcbcb680bc21059bf527f5c3c72373f26b2cd298 [diff] | |
| parent | 43bcbd875843d80421f8b1fc777b8d6f5b9e967d [diff] |
am 43bcbd87: am 45c66a0e: (-s ours) am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread * commit '43bcbd875843d80421f8b1fc777b8d6f5b9e967d': wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed