tree 9afdd1fa266ef7914943b2ada0a0193581ac1891
parent 665b653b817052a99e77dff65fb08071cb996bda
parent 38f30693ced45553cb684ceb7a9e3be335424706
author Robert Ly <robertly@google.com> 1308110221 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308110221 -0700

am 5e69c0f5: am 1dbb7075: am 8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2

* commit '5e69c0f5569940b5f6a0f9c5a2677639c5ed3062':
  cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac