diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-06 22:54:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 22:54:41 +0000 |
| commit | 4e1879fada075a19449ea770c4fb43f9ff629fb3 (patch) | |
| tree | 6c4bd3507188519b14946475042353ab2658aa94 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 4c64aaa8a52cc6ce7d1023d639ace53812bb3c0e (diff) | |
| parent | 37e1b5a099f7ca26ab424015dbe5a67f5ed7400e (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: 37e1b5a099 -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 60c41ae4a6 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12986651
Change-Id: I821e4c0731d13a5fb92859e1198d741ff0db09b8
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions