Merge "Add translate=false to Units-related preference_keys" into pi-car-dev am: 82b18fde14
am: daff2a3f34

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