diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 19:32:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 19:32:07 +0000 |
| commit | 881ed9a6191c05cdb6bde81bc3e891d993a087e6 (patch) | |
| tree | 6af6afb16984cf93e57ef04eb2bfbaa353c91e18 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 141cb3bdb42474f00a05e76e66dff69a61b64d44 (diff) | |
| parent | 60985238c9b1633ceeba0bd571a9ead003653f9b (diff) | |
[automerger skipped] Merge "Do not expose module IPsec(IKE) API from frameworks" am: 452e4df88c am: 2860b52ecc am: 60985238c9 -s ours
am skip reason: Change-Id I37ba02eb3003ea28e66f50ca0b612597ef48f6d5 with SHA-1 daeb328e32 is in history
Change-Id: I6613d433d89d8e3fa324f6c3062210a8d683fb52
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions