Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_drm_hwcomposer / cb34be54e2d08cc185dab6e3aa8bfe700545b741
commitcb34be54e2d08cc185dab6e3aa8bfe700545b741[log] [tgz]
authorChih-Hung Hsieh <chh@google.com>Wed Nov 22 00:06:41 2017 +0000
committerandroid-build-merger <android-build-merger@google.com>Wed Nov 22 00:06:41 2017 +0000
tree5f4f9e3924d2edb09ef1a7850268cd25f0061d12
parentb764b4e1d88634c779a63e58883cbc326e737a09 [diff]
parenteba3501283fb36721b6e750ca3cbbe6b3d683e51 [diff]
resolve merge conflicts of 03e4b92 to stage-aosp-master
am: eba3501283

Change-Id: I013b9e324b4a051a7f999f616f74319b89e74bf0
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