diff options
| author | Jason Macnak <natsu@google.com> | 2020-05-18 12:05:53 -0700 |
|---|---|---|
| committer | Jason Macnak <natsu@google.com> | 2020-05-18 12:11:50 -0700 |
| commit | 01b2926cf759467c12d9715dd84cd87b89913534 (patch) | |
| tree | 936ab121723a82a3a231f8546cc2865bab6c2ea1 /OWNERS.android | |
| parent | 612426912366e95c262fb848baeafc95a89e0087 (diff) | |
| parent | a03926ece6273ee14b7ea7e662c790e7233453d5 (diff) | |
| download | minigbm-01b2926cf759467c12d9715dd84cd87b89913534.tar.gz | |
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
Diffstat (limited to 'OWNERS.android')
| -rw-r--r-- | OWNERS.android | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OWNERS.android b/OWNERS.android new file mode 100644 index 0000000..be55e00 --- /dev/null +++ b/OWNERS.android @@ -0,0 +1,2 @@ +adelva@google.com +natsu@google.com |