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