diff options
author | Bill Yi <byi@google.com> | 2019-06-22 17:32:55 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-22 17:32:55 -0700 |
commit | e325be794693c59d6437cfadd7b52df5f84d3e1b (patch) | |
tree | c193767dbd7e9abdf140f3ec8bc397107be72bf1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8ae38a2c6cbccc30079777c76e01107cbb0d85ed (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: Ief6fffe883dee6bb76e9fbcc16c07bda23a0708f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions