Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_drm_hwcomposer / ef7f923918952ea99af6b6f1f2c30db9baa2c224
commitef7f923918952ea99af6b6f1f2c30db9baa2c224[log] [tgz]
authorStephen Hines <srhines@google.com>Tue Nov 21 17:27:07 2017 -0800
committerStephen Hines <srhines@google.com>Tue Nov 21 17:27:07 2017 -0800
tree122b57f0c02173fc497254f98ba84b6042d29b42
parentd37101dad9f4b0c28a0f6e83e773a185b39272ce [diff]
parentcb34be54e2d08cc185dab6e3aa8bfe700545b741 [diff]
resolve merge conflicts of cb34be5 to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8d58046752ec975b41957b6ba81552c468c7e5f3
tree: 122b57f0c02173fc497254f98ba84b6042d29b42
  1. tests/
  2. .clang-format
  3. Android.mk
  4. autofd.h
  5. autogl.h
  6. drmcomposition.cpp
  7. drmcomposition.h
  8. drmcompositor.cpp
  9. drmcompositor.h
  10. drmconnector.cpp
  11. drmconnector.h
  12. drmcrtc.cpp
  13. drmcrtc.h
  14. drmdisplaycomposition.cpp
  15. drmdisplaycomposition.h
  16. drmdisplaycompositor.cpp
  17. drmdisplaycompositor.h
  18. drmencoder.cpp
  19. drmencoder.h
  20. drmeventlistener.cpp
  21. drmeventlistener.h
  22. drmframebuffer.h
  23. drmhwcgralloc.h
  24. drmhwcomposer.h
  25. drmhwctwo.cpp
  26. drmhwctwo.h
  27. drmmode.cpp
  28. drmmode.h
  29. drmplane.cpp
  30. drmplane.h
  31. drmproperty.cpp
  32. drmproperty.h
  33. drmresources.cpp
  34. drmresources.h
  35. glworker.cpp
  36. glworker.h
  37. hwcomposer.cpp
  38. hwcutils.cpp
  39. OWNERS
  40. platform.cpp
  41. platform.h
  42. platformdrmgeneric.cpp
  43. platformdrmgeneric.h
  44. platformnv.cpp
  45. platformnv.h
  46. queue_worker.h
  47. separate_rects.cpp
  48. separate_rects.h
  49. virtualcompositorworker.cpp
  50. virtualcompositorworker.h
  51. vsyncworker.cpp
  52. vsyncworker.h
  53. worker.cpp
  54. worker.h