| commit | 7f72086ffc43c2c979f18591e242612c3ebf655f | [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 | 0b8accc2d5b58e5121e60ec38a0a2b829f266455 | |
| parent | 5328f85d576926925815cf5ccd48ddcdba30dacb [diff] | |
| parent | cf30ff9ff3e73d040d3d166fbe177d63d26bb556 [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