Bill Yi
|
a9e8ee6e40
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id83f405b8b044af0e5fd33278109d7a656b9ecc1
|
2022-03-02 16:28:16 +00:00 |
|
TreeHugger Robot
|
a18ff15076
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
|
2022-02-24 18:05:30 +00:00 |
|
Bill Yi
|
fc83e2a05a
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If758b66584626c3d33a0be4982d4cb5ed55e4687
|
2022-02-23 08:24:25 +00:00 |
|
Bill Yi
|
3913e56dd9
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: Idd1873b76e7931f2fc0befd3b34dea0acf7fe1cb
|
2022-02-23 08:21:07 +00:00 |
|
Bill Yi
|
b07f4eca84
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icf0bc906bc6e41539af9fa4200ec6fe24d559b0f
|
2022-02-23 08:20:54 +00:00 |
|
TreeHugger Robot
|
1c5ae8a124
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
|
2022-02-18 17:09:16 +00:00 |
|
Bill Yi
|
b3c81561c2
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I97f82f3f3ab3ac037a2b28c4e0c0db21398a605c
|
2022-02-18 03:17:09 +00:00 |
|
Bill Yi
|
382229bcb6
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I1b36efd22b8f9c8af9ceeca44656c53010349444
|
2022-02-18 03:13:47 +00:00 |
|
Bill Yi
|
bfb1c0090c
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3127e1d696f00a9d496edaa5ed672ac1820da936
|
2022-02-18 03:13:28 +00:00 |
|
Jack Yu
|
b3762ca5f4
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: I8654c830eaebe72d6f84f8966c43ea74979b14af
|
2022-02-08 03:12:04 +00:00 |
|
Jack Yu
|
5163fd7aea
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: Ie7899cd8137c524e3fd39a0b50016fbae5d37120
|
2022-02-08 02:59:06 +00:00 |
|
Jack Yu
|
7093dea7f7
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: I186c750238d8f159b2d33e309c2aa9badf60ff64
|
2022-02-08 02:43:45 +00:00 |
|
Jack Yu
|
cd6ce52ea4
|
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: Ief5899b4af766d3d1c9283e4a5a4500ff66b9009
|
2022-02-08 02:30:37 +00:00 |
|
Jack Yu
|
46bd9ba5a5
|
Do not let guest user disable secure nfc am: 4e543a38f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813
Change-Id: Iffe578c58bf2dcebda45b0b71dd901bd3e08be41
|
2022-02-08 02:15:55 +00:00 |
|
Bill Yi
|
e7f361b3cc
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I66e97246a1e7cccda15c563a0001127629a0b684
|
2022-02-05 08:43:36 +00:00 |
|
Jack Yu
|
4e543a38f6
|
Do not let guest user disable secure nfc
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1 )
|
2022-02-02 17:44:55 +00:00 |
|
Jack Yu
|
05dfb08c80
|
Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 am: b85416796d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I72ccad504b36bd1112660cc180be93c210ae66c4
|
2022-01-28 22:53:00 +00:00 |
|
Jack Yu
|
b85416796d
|
Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I9879ba034ae2b8d7a964a4d6c9d700bad55b636e
|
2022-01-28 22:31:38 +00:00 |
|
Jack Yu
|
1009054124
|
Do not let guest user disable secure nfc am: a579ca7554
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Ic68c6849bb65875aea6286d415c66ae8a9f57dfa
|
2022-01-28 22:19:10 +00:00 |
|
Bill Yi
|
7793bd6b17
|
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Import translations. DO NOT MERGE ANYWHERE
|
2022-01-28 02:54:43 +00:00 |
|
Bill Yi
|
4dab10d29f
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic26c56697a7c78fde677f39f63562fa8327d4b2d
|
2022-01-25 06:29:10 +00:00 |
|
Bill Yi
|
86cab2cd66
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: If1bb4c3824bdba9640309da80b4b7168b32076f3
|
2022-01-25 06:25:53 +00:00 |
|
Bill Yi
|
e4ca28a0d0
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I09e6df9ed565dcd098d1b1a98c51786fe5d87785
|
2022-01-25 06:25:43 +00:00 |
|
Jack Yu
|
a579ca7554
|
Do not let guest user disable secure nfc
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1 )
|
2022-01-22 07:56:25 +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
|
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
|
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 |
|
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
|
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
|
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
|
b04e0ab405
|
Merge "Add caller check to com.android.credentials.RESET" into sc-dev
|
2022-01-13 20:19:00 +00:00 |
|
TreeHugger Robot
|
3e06e0c112
|
[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 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: I19a4cf6f214fa4d6766486a6fea2b82cf7bbc6a2
|
2022-01-13 20:01:01 +00:00 |
|
TreeHugger Robot
|
3a4ebbfcec
|
Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205
Change-Id: I16e704faf7e99596482855c90816b1c3bcf6ca69
|
2022-01-13 20:00:55 +00:00 |
|
TreeHugger Robot
|
01739e127c
|
[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 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: Iff74bcb5c45d9bd9e2a7766fb00c38d289150d1e
|
2022-01-13 19:48:23 +00:00 |
|
TreeHugger Robot
|
ea3d0361c8
|
Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205
Change-Id: I490a23c20a60933dff04251cdf8ba4f24c361e97
|
2022-01-13 19:47:30 +00:00 |
|
TreeHugger Robot
|
67f53e247a
|
Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205
Change-Id: I6593507b33223cf79fbf0e134651b78b93464a01
|
2022-01-13 19:35:55 +00:00 |
|
TreeHugger Robot
|
d902f8c7d6
|
Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205
Change-Id: I7080ca5b236b6dd34cfe66789ef1a141d3b735cb
|
2022-01-13 19:35:50 +00:00 |
|
TreeHugger Robot
|
f43f129dc0
|
Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205
Change-Id: Ibc94e102fc69e4e2052526e1ee000684c5d7724f
|
2022-01-13 19:18:08 +00:00 |
|
TreeHugger Robot
|
1ef5f42b54
|
Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205
Change-Id: I8dae6a8a3fd0ed7cde335ead1e4b760bb5a8d195
|
2022-01-13 19:04:05 +00:00 |
|
TreeHugger Robot
|
50b65a168a
|
Merge "Add caller check to com.android.credentials.RESET" into qt-dev
|
2022-01-13 18:50:36 +00:00 |
|