diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-25 15:40:21 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-25 15:40:21 +0000 |
commit | 3d728354a3a74ebcd98ac8d3f955016f583a8cf7 (patch) | |
tree | 952b37c5992a0466e85325259fc58b07c220a84b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 28c0ad920e930f61fde8de5ecfd5c27dbfff0ff0 (diff) | |
parent | 84316e72673968f05d119f422ceeece591a672a7 (diff) |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c760a652ab -s ours am: fcb0fc436c -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