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