tree 9a803e748d9c4754eb8ef13e89a2ae9882f5ad81
parent 02f4e4f9811a2a1720f76aba2744e4380f0fa5d4
parent ff46480e748555a923242af4238ec8d4822fd2ae
author Robert Ly <robertly@google.com> 1308090167 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308090167 -0700

am ff46480e: am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2

* commit 'ff46480e748555a923242af4238ec8d4822fd2ae':
  cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7