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