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