Merge remote-tracking branch 'aosp/upstream-master' into HEAD
Merge in upstream-master branch from freedesktop.
This syncs the AOSP tree completely with the upstream
branch - with the exception of the OWNERS file.
Change-Id: If87394e44fcec163daddcd51d7f7a451d49aec8c
Signed-off-by: John Stultz <john.stultz@linaro.org>
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