tree 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent a40e97e15924fe120dee066e3e913bb468866482
parent 0c113f694c2a04a9692b3f3f935c05fd5dd70e18
author Scott Main <smain@google.com> 1274317611 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274317611 -0700

am 68728cb3: docs: add 2.2 platform highlights

Merge commit '68728cb3b44aba16abc298a37f6110ed00a781dd' into froyo-plus-aosp

* commit '68728cb3b44aba16abc298a37f6110ed00a781dd':
  docs: add 2.2 platform highlights