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

* commit '270adf7cea3977b02a4f9f9c07a0759504812ee7':
  Fix SettingsTest#testSecureTable