diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-15 11:51:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 11:51:28 +0000 |
| commit | ecc2eac2c5825e83484dea446005862084766fb0 (patch) | |
| tree | b70861bc672eae588dff79e4ebbd6450dd961d01 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c173cc562b39424926d56ce18b2f2d1d32283bf4 (diff) | |
| parent | 772190aff8bc831eab5652928682caa54575f5fb (diff) | |
[automerger skipped] Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." am: ff22e5f83c am: f85385c8de -s ours am: bd6dd54c7e -s ours am: 772190aff8 -s ours
am skip reason: Change-Id I9d1a0e9616cdc7089a9bef7c96ff3780de36ed8d with SHA-1 e613309f76 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320295
Change-Id: I5fef7a5bfc90943ac95c9e888bf4f42bc08a7536
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions