diff options
author | Xin Li <delphij@google.com> | 2019-07-02 10:02:36 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-02 10:02:36 -0700 |
commit | f56a529627f5620c88fc11dc3955fa5e5c2ce471 (patch) | |
tree | d47d65b059d245796d99484cd4ab48e9c56c8630 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 2db791f6b1caa5c776720442b3942ddc0a1d1ff8 (diff) | |
parent | 0172a23b1af4735bcca3580bc53e37f57a639c7a (diff) |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 0172a23b1a -s ours
am skip reason: subject contains skip directive
Change-Id: Iaebf94c5293effd4087eb0440c39f2b1a74e0b02
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions