| commit | cf30ff9ff3e73d040d3d166fbe177d63d26bb556 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Feb 02 16:44:55 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 02 16:44:55 2011 -0800 |
| tree | 12a552a7b5527f5337adab29948ca5123dfbece3 | |
| parent | a81c4780379b6bade7fbe88639170f92155a6b5b [diff] | |
| parent | eba0a98abd2a67554031dd6a65e0ff5e0bd2b92e [diff] |
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 '94a6c689acb03ba01546a10933699bde22bb4a4c': 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