diff options
author | Bill Yi <byi@google.com> | 2019-07-03 16:45:08 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-03 16:45:08 -0700 |
commit | 3c8ad090018b3adb76abce6f6ab010d08bf87a7d (patch) | |
tree | 43f76539af21d02c4454aa7cde13209fd90a23d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d75d59e276e0dcb84a6f0073a05ffd55b259e5fb (diff) | |
parent | 4712a0f4a050e0a0b5e437db9d3d603e7af516fb (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 4712a0f4a0 -s ours
am skip reason: subject contains skip directive
Change-Id: I0cf8aadd5166a4bcd7e0abfcaf38ac87fb0085e4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions