diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-10 01:59:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 01:59:24 +0000 |
| commit | 4df28b66ead17789291b18d8a159220a33ea45c4 (patch) | |
| tree | fba70df36937043bc8a63aebbf5167ae503ec135 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 33b7db96e276af5d8454934425cd47eb362fb4c2 (diff) | |
| parent | 16b8f33c6e99607486762f0437efda51c90e99a8 (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: 16b8f33c6e -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: I235447b402e1c2d2706eeab87e1be4de5bb4db4f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions