diff options
author | Xin Li <delphij@google.com> | 2019-08-15 16:35:23 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-15 16:35:23 -0700 |
commit | 0e80b14588894c33a916194ff0d2d67e875d0ff1 (patch) | |
tree | 8b60ed941f57d973498906e0a7c5271090be5bc8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 62a0694411a7eaad9111446d78ae4a868a5e3bb7 (diff) | |
parent | 80860803a414c1d496a5bb9c6a6dcde3777fd67b (diff) |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
am: 80860803a4 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibb510ec02656e59b851599f88ae31c6e10377fca
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions