commit | 45c66a0e1ce3d38c20804caaa6cda896187d88fb | [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 | f4d9e930dd446e8a99760cdbfe09874affefc35b | |
parent | 603b475e59d0ebcdb9bac297fc91e80cafbdb3a9 [diff] | |
parent | 94a6c689acb03ba01546a10933699bde22bb4a4c [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