OSDN Git Service

am 45c66a0e: (-s ours) am 94a6c689: Merge "wholesale manual merge of docs from ginger...
authorScott Main <smain@google.com>
Thu, 3 Feb 2011 01:02:53 +0000 (17:02 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Feb 2011 01:02:53 +0000 (17:02 -0800)
* 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


Trivial merge