Commit Graph

90899 Commits

Author SHA1 Message Date
TreeHugger Robot
71a6671e1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 87e5157b5a -s ours am: dc9cf72aab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib053ea13cbf9ffd0760bdb28c8f70dcd8a5f19c8
2022-01-14 18:37:12 +00:00
Bill Yi
a8d53dc128 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d56130c5e -s ours am: 9af90ac95e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7813deae837eb8512fa0e1ad4db436b0290477c
2022-01-14 18:36:10 +00:00
Bill Yi
0806182787 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0179fc901f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34f5ffbd921cbd8676a96aa44cd3d8ec8b90498d
2022-01-14 18:35:42 +00:00
TreeHugger Robot
7f1e201765 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours am: e7e23fad18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8795a29e447ba68fd1c08d93a8a89508103c8843
2022-01-14 18:34:39 +00:00
TreeHugger Robot
e7e23fad18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e677ef2a2c919b027b8c565e6b01be47d4724f4
2022-01-14 18:34:27 +00:00
Bill Yi
9a7585cd87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours am: bbf27131c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d3a6241ee538a049846b802553435bdaf9a8698
2022-01-14 18:34:24 +00:00
TreeHugger Robot
5714ee98e2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 87e5157b5a -s ours
am skip reason: subject contains skip directive

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

Change-Id: If38c3dfceaa1a4b436a2ca7f61a6ae7a7b9d3d6f
2022-01-14 18:33:31 +00:00
Bill Yi
ed6a7764e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours am: bbf27131c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8669d09a173bce2a7f640dae6bf8a970d51f85dc
2022-01-14 18:33:23 +00:00
Bill Yi
bbf27131c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36a0e9655821f97c5fade9d1890c3987202db953
2022-01-14 18:33:17 +00:00
TreeHugger Robot
dc9cf72aab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 87e5157b5a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I905faea38be17bfb31c559f4a4757d41a1a49a9c
2022-01-14 18:33:11 +00:00
Bill Yi
9af90ac95e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d56130c5e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75493e6cdc4f9e4d0a4b175e133d59d943b21f00
2022-01-14 18:32:41 +00:00
Bill Yi
64c5aafe71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d56130c5e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00652eaf0ba8ed71a916d0c6f074d33838f62a79
2022-01-14 18:32:39 +00:00
TreeHugger Robot
572b59c465 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-14 18:09:51 +00:00
TreeHugger Robot
87e5157b5a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-14 18:09:47 +00:00
Bill Yi
0eab9c02b9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I962c318f41adcf180b885f2052ce0ec4952edfb6
2022-01-14 09:22:25 +00:00
Bill Yi
a6f38c19f8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib7868c5698aef46813818165545a388552033564
2022-01-14 09:18:54 +00:00
Bill Yi
9d56130c5e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie7fde007b60291d37ac3283c0037c3717b2798be
2022-01-14 09:11:12 +00:00
Bill Yi
3bf676d7ce Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic57de1e9085d2e5ebc2a4eaaa38bdcbc1af70090
2022-01-14 09:09:42 +00:00
Bonian Chen
e936ffecf4 [Settings] SIM colors are referenced by getIntArray() within source code
SIM colors are referenced by getIntArray() within source code

Bug: 211956916
Test: build pass
Change-Id: Idefac365e750e454a2c3c98b2b4f17acbe143820
2022-01-14 05:56:35 +00:00
Bill Yi
0179fc901f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibe78ecd75a57eabe935572964ce4f941dcbe18d7
2022-01-14 03:46:33 +00:00
TreeHugger Robot
71522952f1 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: fc22f7f99f -s ours am: b03be4ee77 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Id3435eb8d89dc1b74edc98c9c91677d9a3e391f8
2022-01-13 22:32:24 +00:00
TreeHugger Robot
6d75af0ee9 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: fc22f7f99f -s ours am: cead5cdd6e -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I373243ef1114d78c3eb780e6f788110607a747e6
2022-01-13 22:31:31 +00:00
TreeHugger Robot
cead5cdd6e [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: fc22f7f99f -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I946974d58d0ad5d136e19c801a72b1db186088f9
2022-01-13 22:14:37 +00:00
TreeHugger Robot
b03be4ee77 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: fc22f7f99f -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Ib8c693ca5216a18a75857792387d780d7de163a6
2022-01-13 22:14:01 +00:00
TreeHugger Robot
37f92a2bf8 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 0abbff1a86 -s ours am: 7f81d953d7 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Ie566122baf441baa4d82bf7234f36ea50979c85b
2022-01-13 22:06:16 +00:00
TreeHugger Robot
fc22f7f99f [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: If75738f8e8c3e4e6febfd77710e81613978153f2
2022-01-13 22:02:06 +00:00
TreeHugger Robot
42aa6b082a [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 0abbff1a86 -s ours am: 87cbf72d91 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I98ac2843b0a81d0ef4356c96e41d6d8b3456c7d3
2022-01-13 22:01:20 +00:00
TreeHugger Robot
7f81d953d7 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 0abbff1a86 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I76abaa00ee0d4d99d452dd4b1be88cca5ac5b6d0
2022-01-13 21:50:50 +00:00
TreeHugger Robot
87cbf72d91 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 0abbff1a86 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Id720143da3b485fd9a01bdaaa6a31064029ad70b
2022-01-13 21:50:48 +00:00
TreeHugger Robot
8a91ea7add [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: If02ad441dd23232075e4fbe9b1927e795aed175e
2022-01-13 21:43:35 +00:00
TreeHugger Robot
0abbff1a86 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I3a13d6cf9644292e474c5554e6423072aca2fb67
2022-01-13 21:37:42 +00:00
TreeHugger Robot
616aecf1ec [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Iacff1f7f942431bba6f09a9f500a8e60ea394824
2022-01-13 21:25:16 +00:00
TreeHugger Robot
97729a9e16 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I0c4662c0cda74c28d2385ade52a345e84086bbc9
2022-01-13 21:06:55 +00:00
TreeHugger Robot
02a19ec59d [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I34d7fec987c297fbb846888d9cf187d0a0f7321c
2022-01-13 21:06:50 +00:00
TreeHugger Robot
16e91b5782 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours am: 887a7b5c43 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I664394c55298a4bb751f9d709c3ff4a54b098cae
2022-01-13 21:06:23 +00:00
TreeHugger Robot
f4dd91931b [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours am: 638c6fb3fc -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I9100456ceedb6b084af41000054d033dde94ff86
2022-01-13 21:04:38 +00:00
TreeHugger Robot
638c6fb3fc [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I59fe851b88df7c4fbf48c384c78d9af03bc7c673
2022-01-13 20:50:16 +00:00
TreeHugger Robot
887a7b5c43 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Ia6e5b90c5642742dd540e9a2d15efa51dfffa174
2022-01-13 20:50:16 +00:00
TreeHugger Robot
3f6a48a552 Merge "Add caller check to com.android.credentials.RESET" into rvc-dev 2022-01-13 20:43:35 +00:00
TreeHugger Robot
9f4837e276 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I858b821fe9d17c4c46d61cb0dc57025b454cbc7e
2022-01-13 20:32:00 +00:00
TreeHugger Robot
095c123e60 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours am: f74fe2981a -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Ia6035dc9e4de2d740c71529b831066885b6e34c6
2022-01-13 20:31:44 +00:00
Automerger Merge Worker
aebae8faba Merge "[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours am: 76fba21fa8 -s ours" into sc-v2-dev-plus-aosp 2022-01-13 20:31:41 +00:00
TreeHugger Robot
e1027822ed [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours am: 76fba21fa8 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I76cb26b5fc9c4afbf5be481372d2e9bab98c0420
2022-01-13 20:31:37 +00:00
TreeHugger Robot
701fe2cfde [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: ab8b39c5e0 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I034ac7eeb1557b79fad15ef4a52d8f5d62668997
2022-01-13 20:31:35 +00:00
TreeHugger Robot
d8e43e80c0 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: 45bfdf58b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Iaced4c96addd8b30fc9eb63f65d496ec122530bd
2022-01-13 20:31:28 +00:00
TreeHugger Robot
f74fe2981a [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I426970b84625e07872ab3973336a1c4133ef42a5
2022-01-13 20:20:45 +00:00
TreeHugger Robot
76fba21fa8 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I6cce0aeefff778c09b3b8b531299cbb82e9bb5d9
2022-01-13 20:20:43 +00:00
TreeHugger Robot
ab8b39c5e0 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I9def541c37fcc068c201abd75394cd3623b8db16
2022-01-13 20:20:36 +00:00
TreeHugger Robot
45bfdf58b9 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Idb425f3dff3259ba3e121a5cbad0cf1cc4feb36b
2022-01-13 20:20:35 +00:00
TreeHugger Robot
b04e0ab405 Merge "Add caller check to com.android.credentials.RESET" into sc-dev 2022-01-13 20:19:00 +00:00