Merge "DO NOT MERGE Add user picker to the Settings" into pi-dev
tree: 32f740375a0c8b21944851536d125dde498f13ff
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg