diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2021-01-13 15:14:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-13 15:14:28 +0000 |
commit | 842030f02cc35588fd65118cff98e7382b17e42b (patch) | |
tree | f941129e27afbfac1f858f708c3c81d7edecd4d2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a5dfc094fe5f37cc9b33a3809ca8d7fbb9bdccf5 (diff) | |
parent | be0a5157a40c6f70d691d7ef917cc9eba8d53f31 (diff) |
Merge "Stop using VPNs in getActiveNetworkForUidInternal." am: d25da5eb90 am: be0a5157a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529106
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I99171813b9dba39ac95bab1391fd8db905b5f841
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions