Merge 'aosp/upstream-master' into 'aosp/master'
... 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: I6dafb814cc47e3193439cc10af74a0099962813e
This commit is contained in:
commit
01b2926cf7
25 changed files with 743 additions and 169 deletions
2
OWNERS.android
Normal file
2
OWNERS.android
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
adelva@google.com
|
||||
natsu@google.com
|
||||
Loading…
Add table
Add a link
Reference in a new issue