| commit | 43bcbd875843d80421f8b1fc777b8d6f5b9e967d | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Feb 02 17:02:53 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 02 17:02:53 2011 -0800 |
| tree | 7f68fc97863ad178dcb03dcb26b22387112ae4df | |
| parent | 44e3b0d0344955d5ce1bbb0b329627e24b7dd468 [diff] | |
| parent | 45c66a0e1ce3d38c20804caaa6cda896187d88fb [diff] |
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 '45c66a0e1ce3d38c20804caaa6cda896187d88fb': 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