diff options
author | Bill Yi <byi@google.com> | 2019-09-25 21:57:10 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 21:57:10 -0700 |
commit | d814d68a191b9c2299920a9795d36f0e82280584 (patch) | |
tree | 0cb4de1e51ab0831b5df5f427cb083b05f112412 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7f92027e2fa886b1fc0a3f356383817819eb1648 (diff) | |
parent | 36fe9963607529bd84425ec3cff3734dc8c8b159 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 48de73d2bf -s ours
am: 36fe996360 -s ours
am skip reason: subject contains skip directive
Change-Id: I8f48142dc45512cd11a76ca997d512e6c62d08b5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions