OSDN Git Service

am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp...
authorScott Main <smain@google.com>
Thu, 27 Jan 2011 03:13:54 +0000 (19:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Jan 2011 03:13:54 +0000 (19:13 -0800)
commitd8f50d97abcc0917d35bb79b275f82e515465c60
tree33fe9c9c584ec0aec3aa4d1afa05b0bbbbdbec3f
parent5f16f611841e663fe4c833d9cfd65a3627dfed35
parentb4e62fdab5ab138582934d341262772607b59bec
am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '796f1af04567dab098f638c9166caebc2818efe4':
  enable preview mode for docs and add api level 10 flag for api level diffs