commit | 2cce29e6789f632c88be4e674e2454dd229d991d | [log] [tgz] |
---|---|---|
author | John Stiles <johnstiles@google.com> | Fri Oct 13 17:52:53 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 13 17:52:53 2023 +0000 |
tree | 4da1e4d8e247f64aa1e4d7a0c04b5fddd7c9682f | |
parent | 58ab4b3e81c01fc40db5b0b1647413d01bf6a21c [diff] | |
parent | 9fce1b42c316755a5ab2fa0b08279000038a2ee4 [diff] |
Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e10 am: 976a90621b am: 9fce1b42c3 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534 Change-Id: Ia8641e789c625fd55c50783bb9dbcf3ba5c90b73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>