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