diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-06 22:01:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 22:01:32 +0000 |
commit | 37e1b5a099f7ca26ab424015dbe5a67f5ed7400e (patch) | |
tree | 4e4f480d1328c746b5ce745b59a227e90a8a7862 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | f9e5ef415bec19a43952a63eff3992ab336ca84b (diff) | |
parent | 014fe5e136eca4d2e49d5152559394f806c641d3 (diff) |
[automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2 am: da1ea4bc80 -s ours am: d39d8ce033 -s ours am: 014fe5e136 -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 33e24c883c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12986651
Change-Id: I51b95fe544bc778399a7cf91c57a7e26b39d2f1b
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions