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