diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-05 05:57:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-05 05:57:55 +0000 |
commit | 1d9fa39be952ec333ab8c8ac640e3dd423c24854 (patch) | |
tree | ddcfa4b79cae9ffe3baa1796ee9b340b53509da9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4a681f2c420c6f413c1962e8a07b503f5761ccf1 (diff) | |
parent | a9bb7e8fffa35519f797326ed4a39e52f5f7e8c8 (diff) |
Merge "Make PrivateAddressCoordinator ignore vpn network" am: 0989373740 am: 004f473e97 am: 9cd671a4a2 am: e6e08b9836 am: a9bb7e8fff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610
Change-Id: Ifb6e7159d4c45136414a9e1a9d0c8f05abdc1ecb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions