diff options
author | Bill Yi <byi@google.com> | 2019-07-14 21:36:53 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-14 21:36:53 -0700 |
commit | c67fc520d30b700e0cb33b0f67a159e6610b8b04 (patch) | |
tree | b294324fce38a93efb61d1d4f91fe9a40b75e128 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | cba599adeaf1c1804be47c393af6d1cc4f809e67 (diff) | |
parent | c26bc895206ecf556e2e744af704f88b75c0c2d3 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: c26bc89520 -s ours
am skip reason: subject contains skip directive
Change-Id: Id017885d9e75d86c34c23bcd0568cc585d1aa157
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions