Hao Dong
|
4a594a2b97
|
[automerger skipped] Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e am: 55ec9b88d6 -s ours
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605
Change-Id: Ib9cd04fecc2870d3cd0a0cf4d9b45ecb9be1dc84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:51:53 +00:00 |
|
Matías Hernández
|
63e9f8671f
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 62bd80ee29 -s ours am: e943c371a8 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I9cefdb2945a0b351f9242403a9145420fb4c5165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:50:53 +00:00 |
|
Matías Hernández
|
9d181abd9f
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 62bd80ee29 -s ours am: ba88ece9fb -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Idad2762c3f560b8c749747ef43d22804f049c651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:36:12 +00:00 |
|
Automerger Merge Worker
|
902b39c57d
|
Merge "[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours" into udc-dev-plus-aosp am: e4b8bdcead -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f1af8c5292 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I6a51c90e5b6b699b7fb8d1416ab4a73c2bdce2d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:11:49 +00:00 |
|
Matías Hernández
|
d5d0ba64cd
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: a2c213f4f6 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ib79e52e66e8a3487715a6d919490d08cb272d4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:11:44 +00:00 |
|
Hao Dong
|
81edf4d6f1
|
[automerger skipped] Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25 -s ours
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033
Change-Id: I35e212d33563d4a1c90298723d4b05d3c6560ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:11:05 +00:00 |
|
Hao Dong
|
d69fbd1daa
|
[automerger skipped] Fix pattern rotation header text. am: 7b99d92464 -s ours
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033
Change-Id: Ic8bb8b1778222af56932685c8fdbceedc4b35fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:11:02 +00:00 |
|
Hao Dong
|
83e4a8a32d
|
[automerger skipped] Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e -s ours
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605
Change-Id: I2e657a847d2f74b1b81d8f8d3bf53cd8aaba98ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:10:41 +00:00 |
|
Hao Dong
|
e0aa02b138
|
[automerger skipped] Fix Fingerprint enrollment UI when display size is largest. am: 2ca3f3232c -s ours
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605
Change-Id: Ia2b3d388b9a19eadd251f3bd847a7708134bf0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:10:39 +00:00 |
|
Matías Hernández
|
721c4098e8
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: ebb5bf9f1a -s ours am: 97062b969e -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Icabc8b2319b429685c5ab366ee24cf4f537dd975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:10:36 +00:00 |
|
Matías Hernández
|
ba88ece9fb
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 62bd80ee29 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ife75d0a4306230505cc01d3fcbad4faf45f0e0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:10:13 +00:00 |
|
Hao Dong
|
b911186928
|
Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033
Change-Id: Icf5479eba2dd94fa40c41cdea7ae4d86e9f58a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:07:43 +00:00 |
|
Hao Dong
|
55ec9b88d6
|
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605
Change-Id: I0411207e8f9a2c955c268b456b83f0b9c871dbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:06:58 +00:00 |
|
Matías Hernández
|
e943c371a8
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 62bd80ee29 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: If20b826b8880656e2fa36cd33a959dabc7af056f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-30 00:06:02 +00:00 |
|
Hao Dong
|
04b1932b25
|
Merge "Fix pattern rotation header text." into udc-d1-dev
|
2023-06-29 23:52:00 +00:00 |
|
Hao Dong
|
72f2058d3e
|
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev
|
2023-06-29 23:51:50 +00:00 |
|
Automerger Merge Worker
|
e4b8bdcead
|
Merge "[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours" into udc-dev-plus-aosp
|
2023-06-29 23:23:42 +00:00 |
|
Matías Hernández
|
a2c213f4f6
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Iffd80fe743aaf57bc4f69f1620fd25e9a143a7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:23:22 +00:00 |
|
Matías Hernández
|
62bd80ee29
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Icf19a7292abc519f50a74bbfeae77467106c486d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:22:41 +00:00 |
|
Matías Hernández
|
97062b969e
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: ebb5bf9f1a -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ic52c29bbfdd24cb186322ccaf5d2638b28a84044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:22:39 +00:00 |
|
Matías Hernández
|
cbce103bb1
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: f64fefb48d -s ours am: c06e16ffe7 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Iceb69cbdeca20eb9cdd03956bf7787d7eeacddc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:01:30 +00:00 |
|
Matías Hernández
|
e0b034a19d
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: 5a23057e27 -s ours am: 40a25b6bb6 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I8b05981a97d165627f67d31f2017d55237cce7a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:59:19 +00:00 |
|
Matías Hernández
|
3f15e470bc
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: f64fefb48d -s ours am: 60302435b2 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Iad9390237591e1d13c6a0fdd5cd574cbacfffce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:58:25 +00:00 |
|
Matías Hernández
|
ebb5bf9f1a
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ic1575200df5b1fd0d88427d8383cac1da30acc5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:36:05 +00:00 |
|
Matías Hernández
|
e0b9249359
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I563b580a28e6e46cdb31ee815a7b9552e82bd2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:35:02 +00:00 |
|
Matías Hernández
|
40a25b6bb6
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: 5a23057e27 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I07b11df00f7d2744cb9668802e149c61e803557a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:13:39 +00:00 |
|
Matías Hernández
|
c06e16ffe7
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: f64fefb48d -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ic28a2798731b745a620899e4638393a5985ef956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:13:03 +00:00 |
|
Matías Hernández
|
60302435b2
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: f64fefb48d -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I197d8b61b836e11124f90bf7f1d7b4381af1a377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:10:33 +00:00 |
|
Matías Hernández
|
7088dd37ec
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I3aaeacc0f707d6a3c72fedf74aba8cb76a1ad6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 21:55:19 +00:00 |
|
Matías Hernández
|
5a23057e27
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I1068ab41413ecb68a9c782cfaea3b7ecbcd620e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 21:31:45 +00:00 |
|
Matías Hernández
|
f64fefb48d
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I261e8b4b37c787b890a7fa69fe2ffcd6718225c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 21:31:04 +00:00 |
|
Matías Hernández
|
ae1f3e9159
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ie7d37b0a284c1c09b4760ba7c01bedf2327ee3c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 21:03:28 +00:00 |
|
Matías Hernández
|
0d3e0dc397
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I240139ad6fd2072b7c2990a20423dfeed10b9763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 20:22:12 +00:00 |
|
Matías Hernández
|
b280f8792e
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I8bb98fc243ae74641ac4a7f44af0ece284dc9ab3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 20:21:10 +00:00 |
|
Matías Hernández
|
d828f6a917
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I8351da597688d18c52b97ed1f22e909cfc168a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 19:49:05 +00:00 |
|
Matías Hernández
|
c4aa31013d
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I62449382a3b6365bfe7fba8b1f148be486f9235f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 18:45:31 +00:00 |
|
Matías Hernández
|
97ecfd35d6
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ib2b171219769531b706b62ccb6759adeacc1129d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 17:57:31 +00:00 |
|
Treehugger Robot
|
bb87b47d60
|
Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev am: e42dcd738d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830766
Change-Id: Ic1ec5e652cff3d5a594230038030ad2f32e3bb05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 17:15:58 +00:00 |
|
Matías Hernández
|
9eb2824be8
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ib404f16baae58c5244ba61fe82974a1d93fa681a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 17:11:24 +00:00 |
|
Treehugger Robot
|
e42dcd738d
|
Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev
|
2023-06-29 16:42:19 +00:00 |
|
Matías Hernández
|
42bd4d88c2
|
Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Iaf37229e9570c29792e801446e8db162ebb3dbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 16:25:28 +00:00 |
|
Matías Hernández
|
9da3c3e771
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: 956ff6faa8 -s ours am: 8a58078e07 -s ours am: a43c0cfa7d -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I57ef0bf516fc2c8509325af710d7e268c0e6dd9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:35:40 +00:00 |
|
Matías Hernández
|
b3427e5e74
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: e1745a9d28 -s ours am: 258b971dac -s ours am: 6dbabdc572 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Ibab5de4c74891a3408164b98ff904baf7ed1857b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:35:26 +00:00 |
|
Matías Hernández
|
e5896026fa
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: df3f3ff5c2 -s ours am: a590ecb718 -s ours am: 7585147637 -s ours am: 56397425cd -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I896c5f818166d205a21ac959b667fb93fbaefa20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:35:09 +00:00 |
|
Matías Hernández
|
d4d76a184b
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: e1745a9d28 -s ours am: 99f3eb361b -s ours am: db5813ef3f -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Iaabd6d4141fb8c34802c96ca56c37c3b1747bc88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:34:52 +00:00 |
|
Matías Hernández
|
434fd39e24
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: df3f3ff5c2 -s ours am: a590ecb718 -s ours am: b0bf5532ff -s ours am: b5fe3c7a6d -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Id17d1da9620c79364405d083894690f5eb10ee43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:34:33 +00:00 |
|
Matías Hernández
|
69c5941f7e
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: e1745a9d28 -s ours am: 99f3eb361b -s ours am: 8f29393698 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I3d6ff9347ad17b3638c8d8661dc1819bc6163831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 13:54:51 +00:00 |
|
Matías Hernández
|
8e5d0ed4b4
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: df3f3ff5c2 -s ours am: a590ecb718 -s ours am: b0bf5532ff -s ours am: 6e37ce9278 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Iff9536a481766519d6f569ee80d0298d0ecb4beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 13:54:30 +00:00 |
|
Matías Hernández
|
a43c0cfa7d
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: 956ff6faa8 -s ours am: 8a58078e07 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Ic6960274dc1c72384688843309e2be9392441d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 13:51:01 +00:00 |
|
Matías Hernández
|
6dbabdc572
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: e1745a9d28 -s ours am: 258b971dac -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I987be9af51a20c1e91bb5fa3110f44d84638621f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 13:50:45 +00:00 |
|