diff options
| author | Xin Li <delphij@google.com> | 2020-12-10 03:05:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-10 03:05:40 +0000 |
| commit | 54ec331515b2123c680393572eaf02d167a7d3da (patch) | |
| tree | b67f109a8dec291343933151d595fb49b48a83c7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3cfbcbee1679369eca04b016bd959339a5e86057 (diff) | |
| parent | 201f2cf86dc6575605076f5fe6e8cb0a595796b1 (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 201f2cf86d -s ours
am skip reason: Change-Id Ib81ba3288a986546bc570c3759c55d026add591a with SHA-1 3cfbcbee16 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520888
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1158b1e4f70b018504c963a76782c8773f698118
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions