commit | d64d21ce274ed3ce8e45f2e2be53c9cff413b4b5 | [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 | 917c047492036f03e0e53bc5bf25be02650aaf95 | |
parent | 28a5f4b9d3ad0cb2e949451cd4254f9299a64980 [diff] | |
parent | 82170c428615d899a2f40cf74fd80b71b92b2d87 [diff] |
am 153cebee: resolved conflicts for merge of f722cecd to honeycomb-plus-aosp * commit '153cebee2432a931773130bffa20e72a982c0107': docs: update homepage for 3.0 announcement