Merge "Small fixes to add account flow" into pi-car-dev
am: c2261eed9e

Change-Id: Ie46f232fbdf58e8cd7e8a3eff0f76e587c6f3e65
tree: 41e5646babd2f2e0814ee546f8ddf3a98508f340
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg