Commit Graph

65858 Commits

Author SHA1 Message Date
Treehugger Robot
8942b451cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours am: f3ae142f67 -s ours am: ca40ee1a3a -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417623

Change-Id: I086d2a926c9089f19e9bf5a26e04a8e6210afd92
2020-09-02 07:48:23 +00:00
Treehugger Robot
958cb755cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5 -s ours am: b372e3fbcf -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417618

Change-Id: Ie0228bd344d0b755ccc745109a2369331d15b622
2020-09-02 07:29:52 +00:00
Treehugger Robot
ca40ee1a3a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours am: f3ae142f67 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417623

Change-Id: I7e811f65e77821275c46b300115828a56583611f
2020-09-02 07:29:37 +00:00
Treehugger Robot
b372e3fbcf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417618

Change-Id: I94bcd92bbc7c3476585bad6fc1334130dcebae56
2020-09-02 07:11:35 +00:00
Treehugger Robot
f3ae142f67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417623

Change-Id: I41cca1a0a56dc19ae68b420aadc78e3cfc3121c9
2020-09-02 07:11:06 +00:00
Treehugger Robot
76947837c5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-02 06:35:32 +00:00
Treehugger Robot
22a9ba1458 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-02 06:30:33 +00:00
Bill Yi
7ec0bc9bef Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I43aa317e93b4ee5e484314bf40cdbc2e5e4aa442
2020-09-02 05:42:17 +00:00
Bill Yi
256ea9e29b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I15697e753d245ca812bd2cba4d174c54811bde91
2020-09-02 05:05:27 +00:00
Xin Li
744507f78b [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558 -s ours am: d92daf10ef -s ours
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12484180

Change-Id: I96cb62de1d30aed204295f417deab1d806bda62e
2020-09-01 21:46:50 +00:00
Xin Li
d92daf10ef [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558 -s ours
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12484180

Change-Id: I0d548c1b5c061e4ee753808040af883dd59cb3ee
2020-09-01 20:37:15 +00:00
Xin Li
d57e13f558 Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:04:34 +00:00
SongFerng Wang
08e3e22ae0 Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 am: 4e657741ae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I2852e9c06cedb61338e6ccaaed078fc07e241a61
2020-09-01 05:00:04 +00:00
SongFerng Wang
4e657741ae Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I4729b601cd161f6506149ebb2d04429b8b8dbd63
2020-09-01 04:40:24 +00:00
SongFerng Wang
318f6bcc53 Merge "Add NR network type to "Global" mode preference" am: 19222f2154
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I1714b765690ac43e77233752d31ef921219584f0
2020-09-01 04:27:11 +00:00
SongFerng Wang
19222f2154 Merge "Add NR network type to "Global" mode preference" 2020-09-01 04:09:35 +00:00
Bill Yi
b7e58c608f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12494205

Change-Id: I4249bd150a1c76528ad511c9b8954debac3857d4
2020-08-31 15:26:21 +00:00
Bill Yi
09cc09a274 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idc7c40c329d18ea4bd4061eb37b4672b71a2ce17
2020-08-31 13:11:17 +00:00
Xin Li
748efff856 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
Change-Id: I2ae428e37fd96226ce4e06032e2c0beaacbd0301
2020-08-28 23:35:54 -07:00
Avinash Nalluri
e4956322e8 Add NR network type to "Global" mode preference
Change-Id: I3b9ce75eb37a5002f7a77561c987c6758baf139b
Bug: 163382085
2020-08-27 15:56:13 -07:00
TreeHugger Robot
66f3b09eab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272

Change-Id: Ib5a7bb2bed92ff6a85e04007ed1ca44dfd87ef2a
2020-08-25 00:50:50 +00:00
TreeHugger Robot
7784b632f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-24 23:47:22 +00:00
Bill Yi
333af71c67 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I189c4535205aeb90f4804f8ce03125d2d0b57afc
2020-08-24 21:56:39 +00:00
TreeHugger Robot
ee6f51cc9e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12434724

Change-Id: Ie86707775f05944896f263c67f109faf4fba6dc4
2020-08-24 17:31:13 +00:00
TreeHugger Robot
fcfa016fc6 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-24 16:39:30 +00:00
Bill Yi
6de20ba7d3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7c05495dd402909c7be8dff05bf3dcfa989046b0
2020-08-24 07:55:38 -07:00
TreeHugger Robot
a8bd2b7a82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428984

Change-Id: I7505c1bd6a8af76501f6c89738d02973d2a9f13e
2020-08-23 02:58:59 +00:00
TreeHugger Robot
66239bfaa1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-23 02:35:15 +00:00
Bill Yi
4cd2078e50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12428603

Change-Id: Ie984a3ec13fe9bf2b0db635fc95c4688992189f6
2020-08-22 15:33:31 +00:00
Bill Yi
6923a98c64 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I62e56f374302ccd788ccef846a68fe136959bfb7
2020-08-22 08:26:30 -07:00
Bill Yi
493440b39d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6a784d62bc3bd3e542e61adb4d7871ee7da49bd4
2020-08-22 12:52:45 +00:00
Bill Yi
24a85bad6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416722

Change-Id: Ie59b03c55a034cd781711e87a7898644c39fe271
2020-08-20 16:32:38 +00:00
Bill Yi
5739e1f877 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1c8c87022237f2cc8b4b5a4623756ddf2f2a3764
2020-08-20 07:46:11 -07:00
TreeHugger Robot
74da04187c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12411666

Change-Id: Ia0536955a70b5e28da3c36b8e268bb65c746e5d1
2020-08-20 00:33:00 +00:00
TreeHugger Robot
4b4b2b29fa Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-20 00:15:12 +00:00
Bill Yi
5f549433a6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibe77ec8b7ad9f52fe7b5fc7514fe7eab0bf02f6a
2020-08-19 23:23:41 +00:00
TreeHugger Robot
b72f1f5475 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12407164

Change-Id: Ie03b90f093eaedc84b8845b4cae9b08ea337eeeb
2020-08-19 16:19:22 +00:00
TreeHugger Robot
1c9f9d50cf Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-19 16:09:20 +00:00
Treehugger Robot
ece108cc9a Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5 am: af6dfc4b8c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: I7912e42f3ddc32e6470790b97c983b561906ffaf
2020-08-19 15:18:31 +00:00
Treehugger Robot
af6dfc4b8c Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: I32affa3deffca49e15bdeb9792bb995c00cb58f6
2020-08-19 15:08:01 +00:00
Treehugger Robot
e40251b9f5 Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: Iad9e0eb16478e12ff2e5340c34bb8cc4ba5ece3e
2020-08-19 14:56:13 +00:00
Treehugger Robot
16503cf517 Merge "Settings: Fix exception in about phone during SIM swap" 2020-08-19 14:47:21 +00:00
Bill Yi
9d00912dc0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3362a8464a53c7b75b3e73989951668ddbcd18c1
2020-08-19 00:50:39 -07:00
Bill Yi
6d103087f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: 69605d12d0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164

Change-Id: I3e07df5a184a12aa61997fb9db07fa7f80b71f88
2020-08-19 07:35:33 +00:00
Bill Yi
921836ad03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: dc84153e81 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164

Change-Id: Iae39fc4a676ce4e8c4567dcc3649f8a167711078
2020-08-19 07:35:25 +00:00
Bill Yi
69605d12d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164

Change-Id: I87be371a25573e769edbb80ed0817e02efb69cd5
2020-08-19 07:19:41 +00:00
Bill Yi
dc84153e81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12406164

Change-Id: I46ef5ca050eb20176ce6783f3d4479b98823067b
2020-08-19 07:19:33 +00:00
Bill Yi
7f9d903a21 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7e397185b6e1a9d39e8af8d83c9f0c766ff09349
2020-08-18 21:53:23 -07:00
Bill Yi
5b84d06935 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756

Change-Id: I0de30d4aafd65ab184661b0b58979cedc5367f4a
2020-08-18 23:55:49 +00:00
Bill Yi
dba8d2eeb4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iad6c46f99fb4b3c48b6580c03a6e482655714213
2020-08-18 15:50:45 -07:00