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