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

* commit '79bf26a1b033b2b200c8a41b7208a62979d99ec9':
  Fix SettingsTest#testSecureTable