am 4f024787: Merge "Add Basic PreferenceActivityTest" into froyo

* commit '4f0247878849011798a597886ceb9d8652cd4942':
  Add Basic PreferenceActivityTest