Bill Yi
83e2de4688
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0866cb948
-s ours am: 57b189b1cd
-s ours am: 039afe7d76
-s ours am: a372c3363f
-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: Ieb88c989150142407b42921b0f38763eb4180818
2021-07-18 08:36:14 +00:00
Bill Yi
6a700fc602
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6bf57142a
-s ours am: b34c90dc47
-s ours am: 6d22e2e494
-s ours am: df3e1e0fac
-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: I7f881a8adb905d2c10685bce7dd27accb84d75f7
2021-07-18 08:36:09 +00:00
Bill Yi
1298190b11
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0866cb948
-s ours am: 57b189b1cd
-s ours am: b9328998eb
-s ours am: 6bdac9bec7
-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: Ie822954737b79d64c508c2c10864d6f9a143a0cf
2021-07-18 08:35:47 +00:00
Bill Yi
18a6c3d717
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6bf57142a
-s ours am: b34c90dc47
-s ours am: 6551eb9d81
-s ours am: dd055c9606
-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: I27fffa125e6a72da919f233848b98b618213fce8
2021-07-18 08:35:21 +00:00
Bill Yi
a372c3363f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0866cb948
-s ours am: 57b189b1cd
-s ours am: 039afe7d76
-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: I81985cc6025111fd6b2d0cf2b2b78166006181f6
2021-07-18 08:23:55 +00:00
Bill Yi
df3e1e0fac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6bf57142a
-s ours am: b34c90dc47
-s ours am: 6d22e2e494
-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: I15ecd8a87c0d44d3f466a1d473ac59b3326415e9
2021-07-18 08:23:46 +00:00
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
8bd258eafd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0866cb948
-s ours am: 57b189b1cd
-s ours am: 073b9f55df
-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: Ifb654bdeddce845535e79b4541a6fc740f3484b3
2021-07-18 08:23:03 +00:00
Bill Yi
3b0eb93296
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6bf57142a
-s ours am: b34c90dc47
-s ours am: 9b92a99d9f
-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: Idf72982b7082d16f3fe1493e2bf2b9b2e642ba55
2021-07-18 08:22:58 +00:00
TreeHugger Robot
dbeae46b8a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-07-18 08:16:26 +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
a5e78740f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a57e31da59
-s ours am: aa3fd6b7f2
-s ours am: 1294646999
-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: I92964a05dfd40f5b13d40f4dd2a69b76f5029fdf
2021-07-18 08:11:36 +00:00
Bill Yi
f70f6efad7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a57e31da59
-s ours am: 84f308fe82
-s ours am: 6001ca8a95
-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: I21ea41a95d2151c2f89373255631c3bd1f4cc7db
2021-07-18 08:11:11 +00:00
Bill Yi
073b9f55df
[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: I659a720863085881d675cd068505da2b683020a3
2021-07-18 08:11:04 +00:00
Bill Yi
9b92a99d9f
[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: Ib3b3d44a27a06c424d8975dd851e7ced82c3310b
2021-07-18 08:11:00 +00:00
Bill Yi
039afe7d76
[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: Iff02581020e064a1d321eb08c1ac2286f066d535
2021-07-18 08:10:03 +00:00
Bill Yi
6d22e2e494
[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: I57289f87442112060cdfd468ec93dbcfe6f3b9a9
2021-07-18 08:09:52 +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
TreeHugger Robot
6a89040432
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4f103d76f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15320913
Change-Id: I7781141195c4273cbd127722ebb32e86e692cd15
2021-07-18 08:02:33 +00:00
Bill Yi
dfc909b43e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a57e31da59
-s ours am: 0488d9d61d
-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: I316b0ed2fa2b6c40cb3961abf7df38409392186f
2021-07-18 08:02:17 +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
cfe4a9eef1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebe0834160
-s ours am: a9f474150a
-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: I230d15276e34c1f3ddf0c08db22f23cf2e0ad75d
2021-07-18 07:54:04 +00:00
TreeHugger Robot
4f103d76f8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-07-18 07:42:43 +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
0488d9d61d
[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: If00eb6ea4b437adc1ff8f4902419cbfdb65f152d
2021-07-18 07:32:52 +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
a4b6166d29
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I064ac24300730a6b3bf3319ccc12b237a0dd40db
2021-07-17 21:00:22 +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
67fee1eadc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5bdf169c9dfcf65379e55ec087c8f4dd9724dcb1
2021-07-17 20:41:09 +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
a36a6d88d2
Merge "Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0
am: fa4d019839" into sc-v2-dev-plus-aosp am: a04623c46d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557
Change-Id: Id4afd1f3a606ca1ab7371d880126dfe8ff984f4b
2021-07-17 01:15:50 +00:00
Curtis Belmonte
ab2f874f1b
Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0
am: 8d443bdebd
am: 61d7968390
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557
Change-Id: Ie2e1a95f8025605dce2c43c09370d536b56370d1
2021-07-17 01:15:11 +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
6e5e15e767
Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0
am: dc04c265a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557
Change-Id: I7700e0f250eb66847c58c59d890123d1c41445ba
2021-07-17 00:57:33 +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
dc04c265a2
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: If1680e7b6bf4836ad94d668fafceda85e5738c8a
2021-07-17 00:51:00 +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
0787f163fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994
-s ours am: 8b66811498
-s ours am: 895fb345fa
-s ours am: 992efb2c83
-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: I787c72985da188df0aae684b974deb5eefd36268
2021-07-16 16:03:12 +00:00
Bill Yi
194420e2e8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994
-s ours am: 8b66811498
-s ours am: deb6e762e1
-s ours am: 8220a53851
-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: I581a47b54ec566682308361e1c3e4e3146e57b94
2021-07-16 16:02:03 +00:00