diff options
author | Chalard Jean <jchalard@google.com> | 2020-08-06 16:54:25 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-06 16:54:25 +0000 |
commit | 085726421e9a8f23ae5e3db230c174125c6abfd8 (patch) | |
tree | 4c293d3fdeedad026bfc0604e69aa709b05ba902 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ca286d76cec05d0f4d37b5c53d70163fdf25d5c0 (diff) | |
parent | 9da99253893bd6e376d7181f3c9efae2dbbbcf87 (diff) |
Merge "Resolve the endpoint in legacy VPN" am: 429b59c8a4 am: fc546021bb am: 4820e9d4e4 am: 9da9925389
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382496
Change-Id: I38622f04de2e66d11115318831a83667a76ef02c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions