diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 12:05:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 12:05:48 +0000 |
| commit | bd0d5634b8755667147409f1d47dc7786bfeb529 (patch) | |
| tree | 5acd3456ddfccc14e079aa8cf37cd22cf1a850e7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b4dc7822663e371543713db771f32233ad98415a (diff) | |
| parent | be83bfea95a1125ce98229ef1815daa3a8653a79 (diff) | |
Merge "[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" into rvc-qpr-dev-plus-aosp am: be83bfea95 -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: I793b4e6f6f0dc4cd57f947788990389aca97cddd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions