diff options
author | Jeff Sharkey <jsharkey@android.com> | 2019-09-12 11:39:13 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-12 11:39:13 -0700 |
commit | 18d2ba49d85287add6d474810fd9078efb6e506a (patch) | |
tree | c695bfca142cda8e0c1fea921f69cc24f1aee33d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7be63cdbf67404dd9966d5c3e66697901fae0dde (diff) | |
parent | e2954d97c138289e569f4182ec480dd91af091c3 (diff) |
[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 92e5e5e45c am: 37e2229257 am: bba6744ff4 -s ours am: 2ccbb35723 -s ours am: 79c2faf372 am: e2a8e18494 am: 0481a6494f
am: e2954d97c1 -s ours
am skip reason: subject contains skip directive
Change-Id: I638846b199cafeac8150a6bb944547e4825b3f38
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions