diff options
author | Bill Yi <byi@google.com> | 2019-07-09 15:04:37 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-09 15:04:37 -0700 |
commit | f97d15933f7ef0d09fc3faf4f95a54ea7b947101 (patch) | |
tree | 279ae19b6d9afef89b383e2dec84951202229614 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 25668fff13f91ebf1828277363d3ff382895311c (diff) | |
parent | a5121a4fa9e41ad31e7b70e6cc3450cda27a369f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: a5121a4fa9 -s ours
am skip reason: subject contains skip directive
Change-Id: I871472cb73d956e6f4c0db622025b63d2ecd7789
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions