diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-23 18:30:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:30:17 +0000 |
| commit | 3e3ccf1743cc866460ecb5ad50e5883cc6960499 (patch) | |
| tree | a34ceda6fdbc602f446666f19dc10876b58599e1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | af15627d355a3b12811f5cce4a216fd3634f0144 (diff) | |
| parent | 68d657bf31262540ff9d16b3a397cc5875a7b821 (diff) | |
[automerger skipped] Merge "[5G settings UI] Add config for the 5G limited VoLTE alert dialog" am: 8d0dfda3ce am: ad4b60130d -s ours am: 68d657bf31 -s ours
am skip reason: Change-Id I5a5ab9e47722ad2ba28038233c5d2fc5fbe7e667 with SHA-1 27b6a58a41 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1347357
Change-Id: Id593c809835cee04349f02549d6ae4686d91fe91
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions