diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-27 05:32:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-27 05:32:55 +0000 |
commit | 494b6c8fc96f352690a9cb98d7c61065a3bb5b07 (patch) | |
tree | b5f3312479bc362a5a6d957135fd1035843a15a7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 60fdcae952b1aa53380a7513da7d0b00cbe9d7f5 (diff) | |
parent | 01ca546bd05bd4ab022641ece72a9c5b4d700a8e (diff) |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7545f42d2a -s ours am: 08b872b34e -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