diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-01-13 15:35:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-13 15:35:20 +0000 |
| commit | 5ed89a035df54e6d95943753bcd83f15f5f36d74 (patch) | |
| tree | f7b658c8f6a72c952479b917badbf6d9fedee6ec /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b57d8d8a265b0383be440fb6483039df61ee024f (diff) | |
| parent | 842030f02cc35588fd65118cff98e7382b17e42b (diff) | |
Merge "Stop using VPNs in getActiveNetworkForUidInternal." am: d25da5eb90 am: be0a5157a4 am: 842030f02c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529106
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie3a2d91045fccbf7b03bca9f6d2bc67c598d8d62
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions