diff options
author | Bill Yi <byi@google.com> | 2019-05-25 13:12:22 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-25 13:12:22 -0700 |
commit | df2cca32f37d593bc7a2cc6d7763a48197cdcda6 (patch) | |
tree | d2e54955d7356a3f52e0e425b96be230ef95f630 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0ee3596273720b5fd57309b8423d76355c025641 (diff) | |
parent | 2d33bb61ca7b04d74e60add51d7eed2955d33fab (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 2d33bb61ca -s ours
am skip reason: subject contains skip directive
Change-Id: Id5f23df67795f9cef6f86609814ae82231c602de
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions