tree 449f55443cdd38fc4701b127d4a8d0f05a91cc85
parent 611e0a7a1edf04ad11b947b00b3480caa1f9d486
parent e37c6dd2e0e877933dc771da347241f5c6507bb7
author Tim Van Patten <timvp@google.com> 1631662445 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631662445 +0000

Merge remote-tracking branch 'goog/mirror-aosp-master' into goog/sc-qpr1-dev am: e37c6dd2e0

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/angle/+/15829291

Change-Id: I378f749f1df0c0ed6b8fecbd4033ce1a0b9cc286