diff options
author | Bill Yi <byi@google.com> | 2019-06-19 14:52:26 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 14:52:26 -0700 |
commit | ed09cc8bf837028638ebe9d2841654edbf1e8704 (patch) | |
tree | cab59a4a253ed39d1bc24e49536a184eb5afcc9f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | eb78772f6f040b7d064c5191592ad1022b40e76c (diff) | |
parent | 8c609b6283fbff3fe3416d205569f7b2d9ddd7db (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 8c609b6283 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibdecd56dda27a0d57c879bb25d33be0a93b374d3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions