tree ab02c06224e3860f3266b79d0acd849923ac9cff
parent d6593f647bb2feb28d650eb7cb0e7d30d11108b8
parent 79bf26a1b033b2b200c8a41b7208a62979d99ec9
author Brian Muramatsu <btmura@android.com> 1291064439 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291064439 -0800

am 79bf26a1: am 270adf7c: Merge "Fix SettingsTest#testSecureTable" into froyo

* commit '79bf26a1b033b2b200c8a41b7208a62979d99ec9':
  Fix SettingsTest#testSecureTable