diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-23 18:59:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:59:54 +0000 |
| commit | 6357b40243f099fa336fdd5db80ba084a5da35ae (patch) | |
| tree | 93c73b4da8d78cd3f150cb8fc10befb4fb5aaa64 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d07090bc6c732379e0146095abc02a7de3725999 (diff) | |
| parent | f67e21f1f4fdf89bb8ad9bc1ff14633d2ec94996 (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: 3e3ccf1743 -s ours am: f67e21f1f4 -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: I8ee00a27f4e7a76b74d542612f6d62cd47b116d1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions