tree 7348cc4a5e9d12338bd14ac1f42303c0e4199913
parent 5f1626372d8d00f91ec1c2d01fb0b30dee58cef3
parent 2ecb884f7586218a1608cd5b0d82a45de6f9a069
author Robert Ly <robertly@google.com> 1308110231 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308110231 -0700

am 2ecb884f: am b481a600: am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2

* commit '2ecb884f7586218a1608cd5b0d82a45de6f9a069':
  cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d