tree e1dee9846d00ef8d55c5cfd042e1c859308c6526
parent 0daf40ca9a764088c3eb59be956674ac67b91384
parent 2aeafe0baaab1f833110994deb7cd6714cab1d5f
author Robert Ly <robertly@google.com> 1308110211 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308110211 -0700

am 2aeafe0b: am b5c31b8a: am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2

* commit '2aeafe0baaab1f833110994deb7cd6714cab1d5f':
  Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"