am b0e787d2: am e339464f: am 1bcb6658: Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo

Merge commit 'b0e787d2d67d1214b3233b822a5ed2517c8e0557'

* commit 'b0e787d2d67d1214b3233b822a5ed2517c8e0557':
  Fix issue #2834005: Android Settings.Secure bypass