tree 01e09e2a5586c79999831795bce23b509374fcce
parent d168fb96c3eaa0a99c6a7685a39d2479950356e4
parent 26571649c654f356ca705ced6ded600d0e2cc074
author Robert Ly <robertly@google.com> 1308089062 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308089062 -0700

am b658dfb8: am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2

* commit 'b658dfb8f4363643b9426649ffc8e48be5c332f6':
  cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e