commit | 78d8170236b2abc22c31a10c45c98940040325e4 | [log] [tgz] |
---|---|---|
author | John Stiles <johnstiles@google.com> | Fri Oct 13 18:57:11 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 13 18:57:11 2023 +0000 |
tree | 2b215c15426c14afd9ddaca04a4dd877e3558f3e | |
parent | 0ab3e015fbe943bf5e5a74aa43a9190e2f2f0124 [diff] | |
parent | 0b5e898dc76941f36f16b408d48c653f2574757e [diff] |
Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e10 am: 976a90621b am: 9fce1b42c3 am: 2cce29e678 am: 0b5e898dc7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534 Change-Id: Ia6ea6a509ca8133793882884ba0a44f2a3d56600 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>