[automerger skipped] Merge changes from topic "aae-camera-rvc-qpr-dev" into rvc-qpr-dev am: 9be7d3cf61 am: b40b50dad9 -s ours

am skip reason: Change-Id I4c5c4975096e1765ea37cc52b9f2d2012792c980 with SHA-1 fd0a21b09f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Car/+/12299275

Change-Id: If202ebf158db72e661f8bc6078258dfd842f52f0
tree: 8a065e68367752a6346687b0c4db50070ae43ff1
  1. car-bugreportd/
  2. car-internal-lib/
  3. car-lib/
  4. car-maps-placeholder/
  5. car-systemtest-lib/
  6. car-test-lib/
  7. car-usb-handler/
  8. car_product/
  9. cpp/
  10. experimental/
  11. FrameworkPackageStubs/
  12. obd2-lib/
  13. packages/
  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. CPPLINT.cfg
  25. OWNERS
  26. PREUPLOAD.cfg
  27. README.md
  28. TEST_MAPPING
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.