diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-01 17:12:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-01 17:12:33 +0000 |
| commit | f353805511e522ebaf9a6bec4d54ddf6c718fd05 (patch) | |
| tree | 6ac6940fd4cb70ffd47b6ab631c2f0311b8f03ff /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 3bdaabfc660835912c0040fd0ce38f03b5228532 (diff) | |
| parent | 7720b1f3d942994436e6edf4132e30a00e27822c (diff) | |
Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 5a700b2725 am: f681bee340 am: 7720b1f3d9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8e99aeefffddf88240cf5f1d7117e022242708f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions