diff options
author | Bill Yi <byi@google.com> | 2019-09-25 22:13:54 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 22:13:54 -0700 |
commit | 8dfb55345f13f333421956f56463150c47ad16f6 (patch) | |
tree | 3c1b7fd33ffd5e0318525d990479be98c2f7c421 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | de64ff25da1a41fc50ea2be50fc5879e31d400d9 (diff) | |
parent | 7f92027e2fa886b1fc0a3f356383817819eb1648 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a737ae8f0d -s ours am: 850e3c7f69 -s ours
am: 7f92027e2f -s ours
am skip reason: subject contains skip directive
Change-Id: I9e2fdedb2796d6efdceb5a2fa8ab3dfab2d2a97f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions