Merge "DO NOT MERGE Updating the suggestion buttons to be generic" into pi-car-dev
tree: 706870f59af1bddcf42be9ffd659b77aa29cd0a0
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg