tree 58de81c9181ad085c35cac5cfd28774cfdca15f7
parent 8345f0a664004fb0e6099cd9bcc035a72f0fbd33
parent 734ee1c2e3d0b2c39f111db8efbf253bc17005b8
author John Stultz <john.stultz@linaro.org> 1547596464 -0800
committer John Stultz <john.stultz@linaro.org> 1547596533 -0800

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>