tree d2dc4f40113aae6627479a7fe1b6ea3968f283cb
parent ca933f1a5efd826a93606ae8af0797750f1da869
parent 1ecfed0017132da81eba5ceed348461c26a00dab
author Romain Guy <romainguy@android.com> 1257884346 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257884346 -0800

am 1ecfed00: am 2ac424f5: am e6b8e2fa: Better previews.

Merge commit '1ecfed0017132da81eba5ceed348461c26a00dab'

* commit '1ecfed0017132da81eba5ceed348461c26a00dab':
  Better previews.