tree e464c39c2bd0870d03795895e571a2d64bebb1ab
parent d0d44c4e988ecdea86c2bb04e29d8f6d20c1c631
parent 8325c3a89197e47cfc2eeb4117c927fb8cb91630
author Dan Morrill <morrildl@google.com> 1304450776 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304450776 -0700

am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.

* commit '8325c3a89197e47cfc2eeb4117c927fb8cb91630':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.