| commit | e925c167095fcfc88bb35cbb5f7a7ffeaab05c02 | [log] [tgz] |
|---|---|---|
| author | calvinpan <calvinpan@google.com> | Fri Jun 12 11:31:46 2020 +0800 |
| committer | Calvin Pan <calvinpan@google.com> | Fri Jun 12 18:03:24 2020 +0000 |
| tree | ca175be4622777d3d0df4521b8f3cc9ac13f28b5 | |
| parent | 7591084f507e23997b10771790d2d96c28124f94 [diff] | |
| parent | e6bb99df75749bf1f9d129cf4b1aa9974ca8a519 [diff] |
resolve merge conflicts of e6bb99df75749bf1f9d129cf4b1aa9974ca8a519 to rvc-d1-dev Test: I solemnly swear I tested this conflict resolution. Bug: 156572031 Expected: Part 5- Verify icon is "5G E" Actual: Icon is showing LTE Bug: 157578829 Adding support for ESN UK Change-Id: I417bbb231fce0941cde8f84b134a6f1181325d43 Merged-In: Ieb482e6c5284731806acb1391857bcc1999b2f27