diff options
author | Bill Yi <byi@google.com> | 2021-01-05 21:40:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-05 21:40:24 +0000 |
commit | 7feb02d98e55b49b22b626590e2068cb8ad7d704 (patch) | |
tree | 3140692390096e1b5ffbef94495339bfb0adfe3c /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | c031e12c7fc0538735dbb7ab8de2ef6bc4f0d01d (diff) | |
parent | 9e99535b15feed0d4883da2859fd2cdccaeffa4f (diff) |
[automerger skipped] Merge "Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 9e99535b15 -s ours
am skip reason: Change-Id I5c1c0f2642cc66716290b5943aad9c88ad91ba5c with SHA-1 cbe8c85595 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13286335
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic87cb4c9c5231c5f53d5f0b4c75458f886bfd97f
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions