diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-04 05:14:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-04 05:14:46 +0000 |
| commit | 820583039dda2d1883b88d7608d05faad2118546 (patch) | |
| tree | 208904347330de74f682084f78541fb5a9ccff68 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7521f725a55b3cd18b2560bb4876fd527c3594eb (diff) | |
| parent | 8397f75d5128a3e6a87307880dff3fc2320551c8 (diff) | |
Merge "Remove NATT keepalive from IpSecTransform" am: c20770fee5 am: 89a98351ee am: 8397f75d51
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512881
Change-Id: I53320999a962c12f7cef9fe804616e62071fce1f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions