diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-28 17:45:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-28 17:45:27 +0000 |
| commit | c23e59b0938bc014f62351e74da6b3896418ebe0 (patch) | |
| tree | 483f425a0bd2d66667ef5b694cc896a7e421e6dd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7a30e0949f8dfe248f7e976aca3db2525b9d7a3c (diff) | |
| parent | 5a2ee21a449d6f6119d4d1581926dd944fff2795 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a157147d9f -s ours am: 40bd90c384 -s ours am: ae54c56096 -s ours am: 2f94d66d62 -s ours am: 5a2ee21a44 -s ours
am skip reason: subject contains skip directive
Change-Id: I562b350ecc0ad5f6421bd82fbe25115a9eb396bb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions