tree 624c933af5103a56d69d3972727ec2162c0fc75d
parent 4963cd0bd1d63fe5a444b2299758d2a2696776f1
parent c7731e070e09007fdd002fd44dfe35bdeffbaac5
author Robert Ly <robertly@google.com> 1308098871 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308098871 -0700

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

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