Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_drm_hwcomposer / eba3501283fb36721b6e750ca3cbbe6b3d683e51
commiteba3501283fb36721b6e750ca3cbbe6b3d683e51[log] [tgz]
authorChih-Hung Hsieh <chh@google.com>Tue Nov 21 15:59:30 2017 -0800
committerChih-Hung Hsieh <chh@google.com>Tue Nov 21 15:59:30 2017 -0800
tree5f4f9e3924d2edb09ef1a7850268cd25f0061d12
parentb764b4e1d88634c779a63e58883cbc326e737a09 [diff]
parent03e4b928e678f224bf9e6320141b2db2ff306130 [diff]
resolve merge conflicts of 03e4b92 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I72d53e4ed877dcd08504af65f24524acb9402ad8
tree: 5f4f9e3924d2edb09ef1a7850268cd25f0061d12
  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. drmmode.cpp
  26. drmmode.h
  27. drmplane.cpp
  28. drmplane.h
  29. drmproperty.cpp
  30. drmproperty.h
  31. drmresources.cpp
  32. drmresources.h
  33. glworker.cpp
  34. glworker.h
  35. hwcomposer.cpp
  36. OWNERS
  37. platform.cpp
  38. platform.h
  39. platformdrmgeneric.cpp
  40. platformdrmgeneric.h
  41. platformnv.cpp
  42. platformnv.h
  43. queue_worker.h
  44. separate_rects.cpp
  45. separate_rects.h
  46. virtualcompositorworker.cpp
  47. virtualcompositorworker.h
  48. vsyncworker.cpp
  49. vsyncworker.h
  50. worker.cpp
  51. worker.h