diff options
author | Allen Su <allenwtsu@google.com> | 2020-06-04 03:29:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-04 03:29:08 +0000 |
commit | db25a7dac59ec01426a058919e89f5e714e993d3 (patch) | |
tree | 29f767bb236c6fadc6d0fac4de10316b963a438e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9db7e9716704fd46c7f448cfb69c07532712c278 (diff) | |
parent | 63c1d4e812fe0b21e7596fb43b35d286899caacc (diff) |
[automerger skipped] Merge "[KDDI] Define carrier config for call forwarding items" am: f7c1dc5a3a am: 63c1d4e812 -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: I8ff539e29e31cbaf7fab064df8cedd6bfb5f4e62
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions