diff options
author | Bill Yi <byi@google.com> | 2019-05-22 00:20:12 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 00:20:12 -0700 |
commit | 0125e1ffe339e796a4a28222d5330b6eae3b8098 (patch) | |
tree | 8381e2638de2df009be26470d39af6e4691fbe99 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | db576284b5084a2bbdb44a38157fe5b7a073f9f8 (diff) | |
parent | 8c9c8a69399348c31edfbcc58a67a859cddde33c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 8c9c8a6939 -s ours
am skip reason: subject contains skip directive
Change-Id: I283a01a5ef5514609bf43829d845a9f977673991
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions