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