Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_drm_hwcomposer / 8f88825edbe3cdae01df6bb5483984ba9672fbfc
commit8f88825edbe3cdae01df6bb5483984ba9672fbfc[log] [tgz]
authorSean Paul <seanpaul@chromium.org>Tue Apr 25 15:48:04 2017 -0400
committerSean Paul <seanpaul@chromium.org>Tue Apr 25 15:49:54 2017 -0400
treeff0b48688cb02274f335fb6c763ee8f00ea273ce
parent982615eba7fba6cd205045032d564bacaee8b3ad [diff]
parent5903f9a23c911f6cea193a3ba8cf1fb34f6b88e7 [diff]
resolve merge conflicts of 5903f9a to oc-dev-plus-aosp

Change-Id: Ifaba5b61db97ad44c15775b9ddfd60f26e9210f3
Test: I solemnly swear I built this conflict resolution.
tree: ff0b48688cb02274f335fb6c763ee8f00ea273ce
  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