diff options
author | Bill Yi <byi@google.com> | 2019-06-22 17:21:08 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-22 17:21:08 -0700 |
commit | 37caf4810e7b2953120d5c4829b9de26fa19adb8 (patch) | |
tree | b75dffb68323871fb32f69f1b02a4df7740028fd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 756636cb24befc59b82ba8e0287029d92eb86e92 (diff) | |
parent | 25a43f362acfb32c2939d2406593ea8dad4f2cf4 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 25a43f362a -s ours
am skip reason: subject contains skip directive
Change-Id: I3e9e158d9cf345d64bf9ea77be78353c388e654b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions