diff options
author | Bill Yi <byi@google.com> | 2019-06-19 19:31:07 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 19:31:07 -0700 |
commit | fb4642f7fc7471f3393bef75b29f2037da7dfcb0 (patch) | |
tree | 8045a0daf3b43e49a367fc87a9623c6c654b8591 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 36cc41f009a63d58033dac8b1cbacbcc8ea5ccad (diff) | |
parent | 6624cdf21db9ad4153b8f31f2ebb0f36bb241895 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 6624cdf21d -s ours
am skip reason: subject contains skip directive
Change-Id: I408d149912d3487fa04d790e103b449aad016509
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions