diff options
author | Bill Yi <byi@google.com> | 2019-07-15 03:04:07 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-15 03:04:07 -0700 |
commit | de91986395577ee1e791d0b2b5f83c27c6a022d7 (patch) | |
tree | 2981279f76e1c2a5a2b28d4a640c55c2ae15eb90 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 16accb02de0f6ef9a1beef7c204a85f44670cecf (diff) | |
parent | 84d6625f9b2372c5c04b4964db14b62b9a1a33b2 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1f6fbcdef3 -s ours
am: 84d6625f9b -s ours
am skip reason: subject contains skip directive
Change-Id: I16724b0e100a92d1c0074c57e359aa905fa5658b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions