diff options
author | Bill Yi <byi@google.com> | 2019-09-25 16:11:42 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 16:11:42 -0700 |
commit | d923b79a221b43bbe168aeaeb37fdd76c44d18fb (patch) | |
tree | c8e287e790ee4fae08838d85841efc27321250f7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 79b6259401d92bfab65bab177f676beeadfd2bc0 (diff) | |
parent | b2497c1d9c54e2634cbe653812239870a76ea9e0 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 15995daccf -s ours am: 57ac183257 -s ours
am: b2497c1d9c -s ours
am skip reason: subject contains skip directive
Change-Id: I3f04e19199cb812b56544a3b4e6962e48de13831
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions