diff options
| author | Robin Lee <rgl@google.com> | 2016-05-25 21:19:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 21:19:08 +0000 |
| commit | ef7e644fc5ce23768cf11c2b397c7938a0971992 (patch) | |
| tree | 38c33630b458bd255cdecaed999d18815215dcfe /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c8a35d64c68386a3be9ecd49f8a7cb6463a80182 (diff) | |
| parent | 48b18f4fa994e201e3eb4cca1e7c823b198359c5 (diff) | |
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
am: 48b18f4fa9
* commit '48b18f4fa994e201e3eb4cca1e7c823b198359c5':
Return legacy VPN info regardless of lockdown mode
Change-Id: I202f19946246aa52d37c3c6bb7665cc58ddf8572
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions