diff options
| author | Allen Su <allenwtsu@google.com> | 2020-06-04 03:59:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-04 03:59:49 +0000 |
| commit | 00cdeeb51374e97fec6ade67dab9482b286bb7f4 (patch) | |
| tree | 4ab7cc4fa4519a8523e355ce7b586d0188cbc963 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9ad495104168254881bd71c0ad75ff0710225276 (diff) | |
| parent | ab8aa05bb2dc27742ca89ee4eee3d68f0ea8977c (diff) | |
[automerger skipped] Merge "[KDDI] Define carrier config for call forwarding items" am: f7c1dc5a3a am: 63c1d4e812 -s ours am: db25a7dac5 -s ours am: ab8aa05bb2 -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: Ibdf78c2e88a6e444acb4dd5184be93eb277bca43
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions