commit | 6ff9940a7463feb3c3f4e4a21e6c84ae4961f9ec | [log] [tgz] |
---|---|---|
author | Alistair Delva <adelva@google.com> | Fri Mar 05 23:16:57 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 23:16:57 2021 +0000 |
tree | 1418aa452ff3c020803ac1248aedd190ff7228ec | |
parent | a0d14ecfcac1e000b43ef57c9cb137a7bc9d56f2 [diff] | |
parent | 06edf3d045c3b6a7a2a8846bf8b559993aae8615 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into master am: a0994de9ca am: e2d45bd078 am: 06edf3d045 Original change: https://android-review.googlesource.com/c/platform/external/virglrenderer/+/1621572 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaf8073775ac1f69bbc5a7722b44b0b8d1601255f