diff options
author | Bill Yi <byi@google.com> | 2019-06-25 08:17:55 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 08:17:55 -0700 |
commit | 95460d28f8757033181da4953e930dc7612deb09 (patch) | |
tree | 56584c4437d8b7ba32a5eaef0c552fca3ebd6e73 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d7479146eb52fade8c84938f1f9f0af4534a250d (diff) | |
parent | c760a652ab4bf5cd909abf1b647fe1a84b3a7870 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: c760a652ab -s ours
am skip reason: subject contains skip directive
Change-Id: Ib7944143b1c161d5cf504c90871fc21934b23245
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions