tree 3cd23b261f3c051671cf2b389e727200199ed0a8
parent 3165f1a8eb707b36a6b2c66379c3fde85d9cc2fd
parent 75c664582c5ce5d94826f37cb725b447a4d62c50
author Dan Morrill <morrildl@google.com> 1304451980 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304451980 -0700

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

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