Merge "DO NOT MERGE - Ask to confirm password in Settings/Security" into pi-dev
tree: 523b00dffbdebe92426e8d370b9ce665854f8ff6
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg