Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_drm_hwcomposer / 6eae1c41cf951f934497e1aac4b0d483c2c61bca
commit6eae1c41cf951f934497e1aac4b0d483c2c61bca[log] [tgz]
authorZach Reizner <zachr@google.com>Fri Apr 14 13:45:20 2017 -0700
committerZach Reizner <zachr@google.com>Fri Apr 14 13:45:20 2017 -0700
tree78c8ab73575ce0a0a68ebe60269bc6c368954da3
parent517b1897074ca529e9d141b156dcecf7f512247a [diff]
parent6419ef5dd33faef61cb555a0b29c2c316aee21ae [diff]
resolve merge conflicts of 6419ef5 to oc-dev-plus-aosp

Change-Id: Ie4977dd6a113a25966a88b7a55cd6704763e05f0
tree: 78c8ab73575ce0a0a68ebe60269bc6c368954da3
  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