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

* commit 'cbd66b7946414c313ec38d6f56dde942293e451e':
  Add Basic PreferenceActivityTest