diff options
| author | Erik Kline <ek@google.com> | 2018-04-25 22:49:59 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-25 22:49:59 -0700 |
| commit | 8e0b2a106ce695b00c270918f6651457f38c70a5 (patch) | |
| tree | 2241ff929b487575a8539952bbff6ca0f9c04b87 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 957593af95a3a66581ab2ce447f99a3b50f8ad4c (diff) | |
| parent | 289d5298eda5887e7ecfa7131ccc0bf9423c8613 (diff) | |
Merge "Fix CaptivePortalLoginActivity probes to bypass Private DNS" am: ec629e2f43 am: 66d8d2a5b6
am: 289d5298ed
Change-Id: Ic76d55861f385d1aecd360adda7f10142d083a47
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions