diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-22 08:23:39 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-22 08:23:39 +0000 |
commit | 558b262c0d0bafbb9d591c30d0c117aed3904721 (patch) | |
tree | 3111ac2d610fbc9d8644888cacb520a35c3cccc3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d5f0c0f842448ddb3e9603cad45af5620df942c0 (diff) | |
parent | 5a524ed647692148e058075d10e0169d0a8fd7b1 (diff) |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 41b4f606be -s ours am: ab59418095 -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions