TreeHugger Robot
|
50a6e16872
|
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 00259adc51 am: b24c3eae4c am: 11400ea2f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697
Change-Id: I3d3bc1bbbbff2c22f54ea8301fb37c8847a235a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 21:02:50 +00:00 |
|
Bill Yi
|
98003ee6a7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: a4eb2b9a37 -s ours am: 9f237dd9b5 -s ours am: 895dbb0eb7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: I1a151677dd46bf010f2d444f1dfb0a073c01431c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 20:46:19 +00:00 |
|
Bill Yi
|
51b3eeb9a9
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: 74ee200fa2 -s ours am: 7531a1ec03 -s ours am: d692d89e1b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: Ie062c70c9acbccae34bf1e7252bfe6366b81d154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 20:35:47 +00:00 |
|
Bill Yi
|
b6bc7c290e
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797 am: faf6409455 -s ours am: 4e09eb096c -s ours am: 72f8242715 -s ours am: c7d87079ae -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: I4043b93756f7fa760a8ee6ded4c087d39bf07b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 20:12:01 +00:00 |
|
TreeHugger Robot
|
11400ea2f9
|
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 00259adc51 am: b24c3eae4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697
Change-Id: I0daab92fd66b0b4bd2dff774932015b5546a9a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 20:03:48 +00:00 |
|
Bill Yi
|
895dbb0eb7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: a4eb2b9a37 -s ours am: 9f237dd9b5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: Idd52f8cde9f9fbdd468bdcc43b146dd03065aef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 19:54:20 +00:00 |
|
Bill Yi
|
d692d89e1b
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: 74ee200fa2 -s ours am: 7531a1ec03 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: I0c4653359316f361d0dbb7c589a443d2c857172c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 19:52:20 +00:00 |
|
Bill Yi
|
c7d87079ae
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797 am: faf6409455 -s ours am: 4e09eb096c -s ours am: 72f8242715 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: I01ffdc10df24a0465a52f7ff2690aee802b1c9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 19:39:14 +00:00 |
|
TreeHugger Robot
|
b24c3eae4c
|
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 00259adc51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697
Change-Id: I08488767f3779fa57fcdfcfc4a48ed21ca92406a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 19:19:29 +00:00 |
|
Julia Tuttle
|
a4877c4410
|
Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: e35f0679e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913
Change-Id: I119564fb748f9fc4f8b0bf533a3fe988bdfb7165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 19:19:15 +00:00 |
|
Julia Tuttle
|
4693fb2f9d
|
Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: c8d12d6b34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912
Change-Id: I13e3b9fedb2e0bed3156e22eab3f1ef982630973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 19:18:39 +00:00 |
|
Austin Delgado
|
4d53fc2add
|
Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: 01570d3bfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172
Change-Id: I3130c2ec0a3aa653a11fd211ab4d7a3c411e7fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 19:15:41 +00:00 |
|
TreeHugger Robot
|
59074a8194
|
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: b73a414dc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697
Change-Id: If7b615285655c95a49cad3e06d4f0d23d2dd2179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 19:11:23 +00:00 |
|
Bill Yi
|
9f237dd9b5
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: a4eb2b9a37 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: Ia92d7f4befddb491341fffb797f77ea4883ddec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 19:07:42 +00:00 |
|
Bill Yi
|
c910c70bed
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: 8a77dd90a3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: If6f69d6f5a70fd798ce21c69deedf86115a4b330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 19:06:35 +00:00 |
|
Julia Tuttle
|
e35f0679e3
|
Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913
Change-Id: I7ff16243bf2d4dfa93062615bd41360090113d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 18:47:05 +00:00 |
|
Julia Tuttle
|
7b3df1c080
|
Merge "Fix a couple compiler warnings in Settings" into udc-dev
|
2023-04-28 18:42:23 +00:00 |
|
Julia Tuttle
|
c8d12d6b34
|
Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912
Change-Id: I64797ad4d4d0ab8fedf35466254cadf95df83fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 18:36:54 +00:00 |
|
Austin Delgado
|
01570d3bfc
|
Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172
Change-Id: If3a258888b10881b28d8452f79d8cc1490a69c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 18:36:41 +00:00 |
|
TreeHugger Robot
|
b73a414dc4
|
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697
Change-Id: Ie1f348768d304da3b1a1e69a93c68c0a846f57ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 18:32:36 +00:00 |
|
Bill Yi
|
7531a1ec03
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: 74ee200fa2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: Icce1e4f50355cc64a2c4ead580c8c7d5213e5587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 18:32:12 +00:00 |
|
TreeHugger Robot
|
00259adc51
|
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697
Change-Id: I3f9ed19a8a4f011ee47ca2afca23321d451d5f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 18:31:56 +00:00 |
|
Bill Yi
|
74ee200fa2
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: I8f782eb9707ea8aa7834609ccfe2c89ebb1e672b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 18:29:27 +00:00 |
|
Bill Yi
|
8a77dd90a3
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: I85283550466989ce53f44f3750ef885ea896e44d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 18:27:27 +00:00 |
|
Bill Yi
|
a4eb2b9a37
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: I8b20c84b1db8f75bc08f08a053a495fb11249d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 18:24:57 +00:00 |
|
Bill Yi
|
72f8242715
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797 am: faf6409455 -s ours am: 4e09eb096c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: Ia90a434a59872b13640ca6e5932f23b0b264ad26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 18:24:45 +00:00 |
|
Julia Tuttle
|
75f566bce9
|
Fix a couple compiler warnings in Settings
Bug: 277938609
Test: builds
Change-Id: Ib5e236220dfcfddec60c9277d06ffbde9645bb73
|
2023-04-28 18:19:30 +00:00 |
|
Julia Tuttle
|
ec12caadda
|
Merge "Optimize imports in AppNotificationSettings" into udc-dev
|
2023-04-28 18:18:40 +00:00 |
|
Austin Delgado
|
9b94905c63
|
Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev
|
2023-04-28 17:42:46 +00:00 |
|
TreeHugger Robot
|
6e524f6244
|
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev
|
2023-04-28 17:01:39 +00:00 |
|
Bill Yi
|
4e09eb096c
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797 am: faf6409455 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: I14a9ed4d975325a7cfb4f618ff67ad46865b9c90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 16:50:19 +00:00 |
|
Bill Yi
|
4174b548cf
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: Iea6d3ccd75a787447cde716ca4b027d4d5e5f07f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 16:48:53 +00:00 |
|
Chaohui Wang
|
c3dbe979b0
|
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad am: 6be82a5ee6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I04be472891e4f66541c4bd15eb920402e619e9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 14:24:52 +00:00 |
|
Chaohui Wang
|
dc86933298
|
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad am: b60bb6a22f am: 165777a935
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I5eee6f33c87278763b892167fa10edc6ce4f5945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 14:10:24 +00:00 |
|
Chaohui Wang
|
faf4b81386
|
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad am: 6d591f5b5c am: a6d606f278
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: Ie929c6eec8c4c612bee99fcc9b3face303baf08e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 14:03:28 +00:00 |
|
Christian Göllner
|
b613cc4a17
|
SettingsRoboTests: fix device state rotation related tests
Fixes: 280015539
Test: atest SettingsRoboTests
Change-Id: I0a3cc713f8df0477a172665a60551b456691b17c
|
2023-04-28 15:26:32 +02:00 |
|
Chaohui Wang
|
165777a935
|
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad am: b60bb6a22f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I9ab9b70f9992ee4911d3e129def2e3e09a75ee4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 13:19:09 +00:00 |
|
Chaohui Wang
|
a6d606f278
|
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad am: 6d591f5b5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: Id9c80b73953e39623dbf9ee2bdc4a670c0eb5d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 13:13:31 +00:00 |
|
Chaohui Wang
|
6be82a5ee6
|
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I71d802cf9ec3e3e686ed380f2b6d85271e0d964c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 12:31:03 +00:00 |
|
Chaohui Wang
|
6d591f5b5c
|
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I162a3dd40f6cda7ccbcef87703b1c5c76843f4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 12:30:19 +00:00 |
|
Chaohui Wang
|
b60bb6a22f
|
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I62662e92f9b302be44eaebe34dc1415924a900ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 12:26:45 +00:00 |
|
Chaohui Wang
|
fec25d4bad
|
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev
|
2023-04-28 11:52:50 +00:00 |
|
Automerger Merge Worker
|
2dcc5233b1
|
Merge changes from topic "am-98b9de0e504e4878968b66aca8c6c1d7" into udc-d1-dev-plus-aosp am: 61f7877e19 -s ours
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 eef23f441c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: I8834cc3d3c15154ae0d47333311f7fdf94d51cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 11:30:56 +00:00 |
|
Treehugger Robot
|
8620f861f2
|
[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d -s ours am: 028c16242d -s ours am: fce49d2554 -s ours
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: Ia26a18b0887b2432532070c3073eb31d95047b80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 11:30:53 +00:00 |
|
Treehugger Robot
|
0d423db650
|
[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d am: 7c369b3dbc -s ours am: 2ef3192c57 -s ours
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: Id7671e023bf00786057f3ceb7b88fecb74d41b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 11:25:55 +00:00 |
|
Automerger Merge Worker
|
61f7877e19
|
Merge changes from topic "am-98b9de0e504e4878968b66aca8c6c1d7" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d -s ours am: 028c16242d -s ours
[automerger skipped] Revert "Back up the smooth display setting" am: eef23f441c -s ours am: 2471b9f543 -s ours
|
2023-04-28 10:38:39 +00:00 |
|
Treehugger Robot
|
fce49d2554
|
[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d -s ours am: 028c16242d -s ours
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: I7a82893233c15bfefb534b67c56a46372f5b1d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 10:38:19 +00:00 |
|
Piotr Wilczyński
|
35145dabf3
|
[automerger skipped] Revert "Back up the smooth display setting" am: eef23f441c -s ours am: 2471b9f543 -s ours
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: Ia1f40ff21d90bb417811cca1235bb4ce1b932367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 10:38:17 +00:00 |
|
Treehugger Robot
|
2ef3192c57
|
[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d am: 7c369b3dbc -s ours
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: I50486bc710b63e92ec88b4342ec676e3ffd2e9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 10:37:53 +00:00 |
|
Treehugger Robot
|
78e2416dc4
|
[automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d am: ea1046bee7 -s ours
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: I2cbcbc4870537da929fdf4ee41254b6b16da7b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-28 10:35:35 +00:00 |
|