tree daf21b8ec895594491c859c9cbdf49b742c0d4bb
parent 8bee41254680493e97c58d4eaa77b5cd112db5ba
parent 0ea4f0d79126e953a87604162c1b9a9e91ffbb1f
author Scott Main <smain@google.com> 1298438115 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298438115 -0800

am 0ea4f0d7: Merge "docs: update highlights doc to remove preview" into honeycomb

* commit '0ea4f0d79126e953a87604162c1b9a9e91ffbb1f':
  docs: update highlights doc to remove preview