| commit | d5444802b7be29d385ad8a12d06b966aa940805f | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Feb 16 12:11:11 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 16 12:11:11 2011 -0800 |
| tree | aff5fa53bcc5f9b6b31b958fc4edae3ac6e36ad8 | |
| parent | 439f5c6b39fe648da835d4c86dfcffed0f46dd94 [diff] | |
| parent | 153cebee2432a931773130bffa20e72a982c0107 [diff] |
am 153cebee: resolved conflicts for merge of f722cecd to honeycomb-plus-aosp * commit '153cebee2432a931773130bffa20e72a982c0107': docs: update homepage for 3.0 announcement