diff options
| author | Bill Yi <byi@google.com> | 2019-08-07 00:08:23 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-07 00:08:23 -0700 |
| commit | 48b226716c72540f23f1b70d7ea58836f8010212 (patch) | |
| tree | 55e8ed088b051dfd58d709b0fdccc8f560248a58 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 66a0db66d1a075f8cd8f8a5bf15f54fc5fe2def0 (diff) | |
| parent | 1124501ceb3a300894bbdae141bd4a113db9ff6f (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b672a3f6f6 -s ours am: 47331f1451 -s ours
am: 1124501ceb -s ours
am skip reason: subject contains skip directive
Change-Id: Ic6b8c26afe26d83c064c122c5b5b6806b440c4c4
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions