Bill Yi
6bdac9bec7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0866cb948 -s ours am: 57b189b1cd -s ours am: b9328998eb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15320912
Change-Id: I363e9b60804fa6392fe46c1a701578918e775c97
2021-07-18 08:23:43 +00:00
Bill Yi
dd055c9606
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6bf57142a -s ours am: b34c90dc47 -s ours am: 6551eb9d81 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15320915
Change-Id: If2750e19212530b99cc78de67e7cb8968298662d
2021-07-18 08:23:27 +00:00
Bill Yi
b9328998eb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0866cb948 -s ours am: 57b189b1cd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15320912
Change-Id: I516221cb9a0553d8c14502a910dbd11ace52f217
2021-07-18 08:11:58 +00:00
Bill Yi
6551eb9d81
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6bf57142a -s ours am: b34c90dc47 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15320915
Change-Id: Ifd61d9ee8cbb6cef38e1f8f7843c634d59039661
2021-07-18 08:11:45 +00:00
Bill Yi
57b189b1cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0866cb948 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15320912
Change-Id: I2c4ab8ca22e13e6d8c0e84662bd5b7fbf2d45ab6
2021-07-18 08:03:33 +00:00
Bill Yi
1294646999
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a57e31da59 -s ours am: aa3fd6b7f2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15317476
Change-Id: Ia4a13417588a14c47ab485f6c82149eaef9f7716
2021-07-18 08:03:02 +00:00
Bill Yi
6001ca8a95
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a57e31da59 -s ours am: 84f308fe82 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15317476
Change-Id: I54dd8a9fbcff63eae71067b7189dd05fd9c19e27
2021-07-18 08:02:38 +00:00
Bill Yi
b34c90dc47
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6bf57142a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15320915
Change-Id: I275e664e9021e0fc598ff0b682ec369e1622230e
2021-07-18 08:02:09 +00:00
Bill Yi
84f308fe82
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a57e31da59 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15317476
Change-Id: I2bc950fd98e84c9b31f25dd09877a08f3f553ad3
2021-07-18 07:33:48 +00:00
Bill Yi
aa3fd6b7f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a57e31da59 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15317476
Change-Id: I929dfa95b1c38314335e05d4ec7e6950a11b937e
2021-07-18 07:33:02 +00:00
Bill Yi
a9f474150a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebe0834160 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15320968
Change-Id: I1919b62d0261fc39c2d52fef79cc1490a7d447bb
2021-07-18 07:23:41 +00:00
Bill Yi
ebe0834160
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1628b32e673a859f91667da04242d6617998376f
2021-07-17 21:07:57 +00:00
Bill Yi
a57e31da59
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1b53832418e52ffaf1b6d784d3eac4f77ab1950a
2021-07-17 21:04:17 +00:00
Bill Yi
d6bf57142a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3ec1d7acf840cad954ce6bb68134a4c4675fb7ab
2021-07-17 20:51:26 +00:00
Bill Yi
d0866cb948
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I28f67cc180d5bc38770f6fa9f80bc6b8cf9852d5
2021-07-17 20:37:34 +00:00
Automerger Merge Worker
a04623c46d
Merge "Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: fa4d019839" into sc-v2-dev-plus-aosp
2021-07-17 00:57:45 +00:00
Curtis Belmonte
61d7968390
Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: 8d443bdebd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557
Change-Id: I581b985435d2c53aca8558bdea1ce148f263e85f
2021-07-17 00:57:21 +00:00
Curtis Belmonte
f5f0e41d7e
Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: fa4d019839
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557
Change-Id: I6cad3df08b0394000938bdf26be7bbeeef509323
2021-07-17 00:57:19 +00:00
Curtis Belmonte
fa4d019839
Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557
Change-Id: I8e42f13d6127890ffbb32c756c8d33b3c87366c2
2021-07-17 00:52:49 +00:00
Curtis Belmonte
8d443bdebd
Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557
Change-Id: I73dd8540c975cdb535a5c0f008d98ecfcf4b23ac
2021-07-17 00:51:02 +00:00
Curtis Belmonte
a18a8a1ad0
Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev
2021-07-17 00:47:14 +00:00
Curtis Belmonte
c6ced3fb21
Fail fingerprint enroll with error if HAT is null
...
Fingerprint enroll expects a non-null HAT. If we don't have one, rather
than crashing or stalling out enrollment, fail fast with an error.
Test: Manual
Bug: 193811614
Change-Id: Ifb791e19430e33cb82566e4916ab1a7b997b32ff
2021-07-16 14:35:25 -07:00
Bill Yi
992efb2c83
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours am: 895fb345fa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309024
Change-Id: I3d840642d68ac3b909b14410af65eb01a1563538
2021-07-16 15:53:39 +00:00
Bill Yi
8220a53851
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours am: deb6e762e1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309024
Change-Id: Ia7ef10030b3c76c6e1688cc2b154d49ebd7c04d5
2021-07-16 15:39:50 +00:00
Bill Yi
895fb345fa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309024
Change-Id: I3feb28d052d3cc4b1770ac21734cf979ac813856
2021-07-16 15:30:20 +00:00
Bill Yi
deb6e762e1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309024
Change-Id: Iddd79a76e845a403b4ea099c1a2b2e8758a7a6b8
2021-07-16 15:29:31 +00:00
Bill Yi
8b66811498
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309024
Change-Id: I27fd22e38caac8c1830c8af4f7a4c608c74b0035
2021-07-16 15:15:54 +00:00
Bill Yi
b31e7319ed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours am: d74db1c939 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: I345858053f5278cd198191a2b5fb8bcf226f39f4
2021-07-16 15:15:43 +00:00
TreeHugger Robot
fc9714007b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours am: 72d510e78a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309028
Change-Id: Ie98fe8029c2ec028a4b05c4ebfb1adecf0a24f49
2021-07-16 15:15:26 +00:00
Bill Yi
f2172047ac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours am: d7444103b7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: I40e6bbf05a568520ea51fb22312a6dbcc8535a3b
2021-07-16 15:15:05 +00:00
TreeHugger Robot
92e8d024ec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours am: 04407bd0b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309028
Change-Id: I191468bc682fafa126fc5355ae9d2b6d7a0b0747
2021-07-16 15:14:59 +00:00
Bill Yi
d7444103b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: I56b73e4bee6fb85692bceb9b7dfeff4f20008de9
2021-07-16 15:00:43 +00:00
TreeHugger Robot
04407bd0b3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309028
Change-Id: Ia3efc9a014a0926eb958af335f346e843617fee3
2021-07-16 15:00:29 +00:00
Bill Yi
d74db1c939
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: I6636912484fe19d521a98c18fa4e19cf48816e9a
2021-07-16 14:59:54 +00:00
Bill Yi
aef4593a74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309026
Change-Id: I5ac7dc76a303bb3ce71b1b4daf19b67d4dc76eeb
2021-07-16 14:59:40 +00:00
TreeHugger Robot
72d510e78a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309028
Change-Id: I42efbb54eda951275302b201b59acd6337100911
2021-07-16 14:59:37 +00:00
TreeHugger Robot
026fba52e8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-16 14:46:30 +00:00
TreeHugger Robot
0fe7a8176a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc60dff6bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15309029
Change-Id: I599e1fd675a3de86cb41a6a42c734af35d8e947c
2021-07-16 14:44:59 +00:00
TreeHugger Robot
bc60dff6bf
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-07-16 14:31:28 +00:00
Stanley Wang
15738313b2
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 am: 69a9d7aa11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: I1122c56ed939fe9eeaaf213d52b08f4cd5fd1be7
2021-07-16 12:15:34 +00:00
Stanley Wang
89f82c126b
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 am: 21a148d9fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: Id188157c1f68ff6227458ff6771910ecd40d4cae
2021-07-16 12:15:12 +00:00
Stanley Wang
21a148d9fe
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: Ifdc3f6d19e74290c2ff6ccb037590861627d6f5e
2021-07-16 11:55:24 +00:00
Stanley Wang
69a9d7aa11
Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631
Change-Id: I287a6788e9ff460ab58a1c61e019be0cf37480a6
2021-07-16 11:54:13 +00:00
Stanley Wang
c916876cc7
Merge "Update the illustrations of System navigation page." into sc-dev
2021-07-16 11:37:51 +00:00
Bill Yi
165a3c9880
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I162d0b3f065d8dd902a251aa847c4367b1dc1767
2021-07-16 09:19:39 +00:00
Bill Yi
8165043546
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If9f25bb8fe9349790b04162a6d09c5ef5183e2e4
2021-07-16 09:15:26 +00:00
Bill Yi
2962edd9b0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I601456c1a376a98531d455c0c292bf57fb696dbd
2021-07-16 09:01:39 +00:00
Bill Yi
1f660bf994
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e85df20c7b2befdee0d43ecbabaac82452c0249
2021-07-16 08:46:43 +00:00
Menghan Li
7c011ae5c0
Merge "Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment" into sc-v2-dev am: 77b8431156
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297637
Change-Id: I81c5f633fb3c1f94056136777fab23b0ab97d6eb
2021-07-16 06:08:25 +00:00
Menghan Li
77b8431156
Merge "Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment" into sc-v2-dev
2021-07-16 05:54:31 +00:00