tree 5e6e135a6ef1bdddae5565a708839aa522ee1ebf
parent 2fdf3b4efcbbb1c7f4fd934ba8ea52005eea8208
parent cbd66b7946414c313ec38d6f56dde942293e451e
author Brian Muramatsu <btmura@android.com> 1291857745 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291857745 -0800

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

* commit 'cbd66b7946414c313ec38d6f56dde942293e451e':
  Add Basic PreferenceActivityTest