[automerger skipped] Merge changes from topic "user_templates" into qt-qpr1-dev am: 50c6e83b4a
am: b6930718da -s ours
am skip reason: change_id I3a76c7b5c52488aa93cd8ca65ef32ece896954d4 with SHA1 8af6b463f1 is in history

Change-Id: Ie938c3c279db32debf219f5ccc863cfa2bc6aeca
tree: 3b21daf4a6effea4b9d243e996b0e19e797394bc
  1. car-bugreportd/
  2. car-default-input-service/
  3. car-lib/
  4. car-maps-placeholder/
  5. car-systemtest-lib/
  6. car-test-lib/
  7. car-usb-handler/
  8. car_product/
  9. computepipe/
  10. EncryptionRunner/
  11. evs/
  12. FrameworkPackageStubs/
  13. obd2-lib/
  14. procfs-inspector/
  15. service/
  16. tests/
  17. tools/
  18. user/
  19. vehicle-hal-support-lib/
  20. .clang-format
  21. .gitignore
  22. Android.mk
  23. CleanSpec.mk
  24. OWNERS
  25. PREUPLOAD.cfg
  26. README.md
README.md

Native (C++) code format is required to be compatible with .clang-format file. Run

git clang-format --style=file --extension='h,cpp,cc' HEAD~

Note that clang-format is not desirable for Android java files. Therefore the command line above is limited to specific extensions.