diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-10 01:44:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 01:44:18 +0000 |
commit | b34c810da3226c5b436ee77aa778324a010dab9a (patch) | |
tree | 91bad13ad80b2a57064c5263611d3e8a8201b3e0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 3fed339eb3fca3b65b99b48bf5026052450d69cb (diff) | |
parent | 107c868f109199f005a7984d43aa1df0cf72debe (diff) |
[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 634c26d63f -s ours am: fe846d3095 -s ours am: 107c868f10 -s ours
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 836ad571eb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778
Change-Id: I1808dfcf62cb957821fc86331814f74171b58204
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions