diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-07-10 05:24:59 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-10 05:24:59 +0000 |
commit | 506d74247aadd92db2785ad12a977838b8db0536 (patch) | |
tree | c4c609cc7f9aab145f26e46e4ba2fb5457e8ee0d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8c482c95e7beadbbc94b29e167fce919fb31a315 (diff) | |
parent | b7e65c47cc75db5f089242aa0137886cbbe00b10 (diff) |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2f5007db0a -s ours am: 7fd9a81f83 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions