diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-15 11:25:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 11:25:15 +0000 |
| commit | bd6dd54c7ea6086bc6c0e9699e7804c6dff4d908 (patch) | |
| tree | be3fa763543cd568c28d4ab1f295aa50f34ae1e5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5898a771fc978c92716ca92a8b80bba837136106 (diff) | |
| parent | f85385c8de43d5cb43b5c1b7c3a526f1d5895bc5 (diff) | |
[automerger skipped] Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." am: ff22e5f83c am: f85385c8de -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: I072ef3331359916bcbe7888a8150e81520e9fc2a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions