commit b3f8cbf754e96102414677ac90415e534a79ef83
author John Stultz <john.stultz@linaro.org> Fri Aug 31 12:10:22 2018 -0700
committer John Stultz <john.stultz@linaro.org> Fri Aug 31 12:10:22 2018 -0700
tree ed8f2e41547ac8e75be4c70e736d80c3e45e4a4b
parent c36b88a22ed029740aa952bd1aee5179e517a961
parent fb3599c39bad496a86a213badbab74e75e0378bc

Merge remote-tracking branch 'aosp/upstream-master' into aosp-fdo-merge

Merge upstream freedesktop/master branch into aosp/master.

Upstream now supports required changes for HiKey/HiKey960 to
use drm_hwcomposer.

Change-Id: I50598105e38b01ea9411c5e7ba809396d7085e23
Signed-off-by: John Stultz <john.stultz@linaro.org>

OWNERS

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..0a442be
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,5 @@
+astrachan@google.com
+marcheu@google.com
+marissaw@google.com
+seanpaul@google.com
+zachr@google.com