tree ee7be8108d2d5d201bce0f59d707fd279c9199aa
parent b658dfb8f4363643b9426649ffc8e48be5c332f6
parent 86ef7977a95d6e1783f646d96992582d1dbf080a
author Robert Ly <robertly@google.com> 1308089407 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308089407 -0700

am 86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2

* commit '86ef7977a95d6e1783f646d96992582d1dbf080a':
  cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a