tree c45c57e57309fcb0b20e33a9262564834accdc5f
parent a46983068e4ff37159e677419ed30b0095539931
parent 28fe7d57075778bcc92b2e79467bd43b3f6f65f2
author Robert Ly <robertly@google.com> 1308088908 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308088908 -0700

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

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