OSDN Git Service

Merge 'goog/mirror-aosp-master' into 'goog/rvc-dev'
authorJason Macnak <natsu@google.com>
Tue, 19 May 2020 16:14:33 +0000 (09:14 -0700)
committerJason Macnak <natsu@google.com>
Tue, 19 May 2020 16:14:33 +0000 (09:14 -0700)
... to merge in http://crrev.com/c/2171157 which
is needed for Cuttlefish on Minigbm Gralloc 4.

Also adds OWNERS.android to avoid merge conflicts
with upstream OWNERS file.

Bug: b/146515640
Test: launch_cvd
Test: launch_cvd --gpu_mode=drm_virgl
Change-Id: Ic3b0812c7c35cc99fc96d3bdd3b8f811fb1507f5


Trivial merge