diff options
| author | Allen Su <allenwtsu@google.com> | 2020-06-04 03:42:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-04 03:42:24 +0000 |
| commit | ab8aa05bb2dc27742ca89ee4eee3d68f0ea8977c (patch) | |
| tree | 4ab7cc4fa4519a8523e355ce7b586d0188cbc963 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7d9e486592f728593fe261228705b493af89bca9 (diff) | |
| parent | db25a7dac59ec01426a058919e89f5e714e993d3 (diff) | |
[automerger skipped] Merge "[KDDI] Define carrier config for call forwarding items" am: f7c1dc5a3a am: 63c1d4e812 -s ours am: db25a7dac5 -s ours
am skip reason: Change-Id Ie49ca51497e8f0d9f16d14cc183311dcd02d8bbb with SHA-1 6206afc8c1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322498
Change-Id: Iea87d6d8af74ad6a6450080386651748a0ae3c1a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions