OSDN Git Service

am 153cebee: resolved conflicts for merge of f722cecd to honeycomb-plus-aosp
authorScott Main <smain@google.com>
Wed, 16 Feb 2011 20:11:11 +0000 (12:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Feb 2011 20:11:11 +0000 (12:11 -0800)
commitd5444802b7be29d385ad8a12d06b966aa940805f
treeaff5fa53bcc5f9b6b31b958fc4edae3ac6e36ad8
parent439f5c6b39fe648da835d4c86dfcffed0f46dd94
parent153cebee2432a931773130bffa20e72a982c0107
am 153cebee: resolved conflicts for merge of f722cecd to honeycomb-plus-aosp

* commit '153cebee2432a931773130bffa20e72a982c0107':
  docs: update homepage for 3.0 announcement