tree bdf409c89e96d95b1a90258eb449dfaf7c450239
parent 43f8ceef76390bfd396c38ea3f0270f5ff3c7364
parent 6d1b05d51abc3164450049e6b2d8520a61022712
author Xin Li <delphij@google.com> 1633679803 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679803 +0000

[automerger skipped] Merge Android 12 am: 89bdc5d524 -s ours am: a1a9d51c13 -s ours am: 6d1b05d51a -s ours

am skip reason: Merged-In I3e7455a6b00d84994be9a5ae125f5a87c7b883b2 with SHA-1 953f6b9949 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/deqp-deps/amber/+/1847377

Change-Id: Ia65dd9b67c259ae66d52901c6b18e9141a85dc57