tree 59f2351cc6aebfe4fd8514d83a9bc31c0851fcd8
parent 6737441c1736607b35f40cdd5b6126f7a0c912dc
parent d9f91425fc740bc85a8629a27b68b48acaf85962
author Robert Ly <robertly@google.com> 1310172792 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310172792 -0700

am d9f91425: am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2

* commit 'd9f91425fc740bc85a8629a27b68b48acaf85962':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052