Commit Graph

124542 Commits

Author SHA1 Message Date
Tom Hsu
0629a8cedd Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 am: 39b150171b am: 1e2ecf3e2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: I0b103c9420eeaed2e1747281e513527a370c8eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 08:00:04 +00:00
Julia Tuttle
008dd9fec5 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: e2a8133da4 am: 16015f0dfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: Ib59598771a395086068a695193e03c5a1d3b1536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 07:59:49 +00:00
Julia Tuttle
d7f708f152 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: 4792f21e3d am: 03b06d6ff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: I5f0ff0d8d88430c2cbc67afd03fe0698b6068edb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 07:57:42 +00:00
TreeHugger Robot
47eb14361a Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed am: d4ceb73fe5 am: 4896c53060
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I44ea0adf4cb1bb187d2df8c4d1f521986c0b061f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 07:56:04 +00:00
TreeHugger Robot
f3b6e920c4 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed am: 9e2e3e9ae6 am: f48a328ac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I1f41f2a2b405626aa1445bafdd34bbfba7b077d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 07:47:42 +00:00
Edgar Wang
d6ebd9536b Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8 am: 2d4d23ecb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012

Change-Id: I9424a29754daf09057eef3e516c813dff88aca94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 06:52:50 +00:00
Edgar Wang
2d4d23ecb3 Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012

Change-Id: I2060622fa99166cf0190bca4d41da7f255a8f337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 06:09:19 +00:00
Treehugger Robot
9ed2ac48fb Merge "[Settings] Update code owner" am: 709b27384b am: c40b06b687 am: a6f0662924 am: 0469be62f0 am: 82296631cd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: I81730fe484cd19aec2a97e43f2f4d7e57ec4672a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 05:53:26 +00:00
Edgar Wang
8155b72cf8 Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev 2023-04-28 05:28:14 +00:00
Treehugger Robot
f500b7a7fc Merge "Fix AppEntry.extraInfo ClassCastException" am: 327867e56b am: 83f2d27e35 am: 97c42d8736 am: e207694022 am: 7a86020bd8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2564510

Change-Id: I9e1d6d1fc05887802bdc39b87e1a075ed33b0c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 04:55:06 +00:00
Zaiyue Xue
66ff2ec083 [automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376 -s ours am: 18d5ebc38f -s ours am: 11abeff5e1 -s ours
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696

Change-Id: I1feb52349652540e89a7e9ac0da1440ede7b622f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 04:06:52 +00:00
Zaiyue Xue
ee946c1102 [automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7 -s ours am: 27c242f01d -s ours am: 3cd1075bff -s ours
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696

Change-Id: I93f7aa31c9ea6e40892106d7b4a44b8978c41a23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 04:06:49 +00:00
Tom Hsu
c3f08dcf56 Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 am: 2bc75c0d5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: Id8451b6b130cfccca0061f8aa9529c0783635641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 04:06:33 +00:00
Tom Hsu
1e2ecf3e2e Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 am: 39b150171b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: Id2f4e945fc893315f15f4f58e0f114187b5edb19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 04:06:24 +00:00
Becca Hughes
cf7a111982 [automerger skipped] Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659 am: 8912f693f7 am: 94da380e34 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: I38a4965d6dfb3fb0067c1be0487bdf38d4f0f94b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:53:51 +00:00
Becca Hughes
3d1c1a26cc [automerger skipped] DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d am: c6a74847e4 am: 45c94c760e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: Id0cb3af08b9071668bd95a7c3547895dd84eefb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:53:05 +00:00
Zaiyue Xue
11abeff5e1 [automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376 -s ours am: 18d5ebc38f -s ours
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696

Change-Id: I2dc70d83faa0bb2c145266367bd6ddb3cf572408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:24:26 +00:00
Zaiyue Xue
3cd1075bff [automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7 -s ours am: 27c242f01d -s ours
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696

Change-Id: Iae245dba27f4bf8a7a8821224cb12c19bc6442a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:24:23 +00:00
Tom Hsu
39b150171b Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: I49425eb7c992008e5dc7f0d028c82e4bee41038e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:23:39 +00:00
Tom Hsu
2bc75c0d5d Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: Ia036cb77c011fb1c1258bef314818ec38beacd26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:21:52 +00:00
Zaiyue Xue
18d5ebc38f [automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376 -s ours
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696

Change-Id: I3cd68b222aa83eada95698d381880433c57b9fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:20:10 +00:00
Zaiyue Xue
27c242f01d [automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7 -s ours
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696

Change-Id: Ic1b0667493cbf0009c71c2ea0cd67ef708d73698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:20:02 +00:00
Becca Hughes
f809f2361c [automerger skipped] Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 am: f1ad544cbe am: f2c28935d7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: Ib226b254937f684a761a6872f13c8fbc22fbe520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:04:31 +00:00
Becca Hughes
c0a375612c [automerger skipped] DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 am: a620612b9f am: 23daa094d9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: Id8acc363bb9b8f74e48d5fc8f02146f222dd7df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:04:27 +00:00
Tom Hsu
bd9263b391 Merge "[Settings] UI part: Add metrics for language" into udc-dev 2023-04-28 02:49:59 +00:00
Zaiyue Xue
6aba166376 Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev 2023-04-28 02:43:00 +00:00
Becca Hughes
3070f810c7 [automerger skipped] Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659 am: 859df31fab am: 5bf3f571d9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: I1fa40d4f578340f8d375b4f4387161224523148f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 01:18:05 +00:00
Becca Hughes
e2ef094e31 [automerger skipped] DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d am: 3107fb0f96 am: b74ca63c04 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: Ie13069e61144da46131653ce99d6fbc3183933c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 01:17:01 +00:00
Becca Hughes
3160236ab8 [automerger skipped] Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 am: 6df62b695c am: 55ceb266a0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: I9032380336088565ed97eaecc61252c704bb0c0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 01:00:44 +00:00
Becca Hughes
2e0d30aaa6 [automerger skipped] DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 am: 7378d6c66c am: 0c3e99a61d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: I1bac5b37afbccf907abbaf931cfc510129a93a23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 00:59:48 +00:00
Bill Yi
1d8c05bf97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a04b6df040 -s ours am: 9bb60a200e -s ours am: 9b25911c3c -s ours am: 7f61419889 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801140

Change-Id: I082a6710c7767c6d35eb31bf0d09a719c30db7e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:15:25 +00:00
Bill Yi
b4b54ad1e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c -s ours am: 9abc703e40 -s ours am: 49103dfc2e -s ours am: e62b917856 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801140

Change-Id: Ic2f26a3b3439734358695de7f92d45a21eb100f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:15:12 +00:00
Bill Yi
94ad3348b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000 -s ours am: 4caa1ee4c3 -s ours am: 155b5266fc -s ours am: f9ffefd7d6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801124

Change-Id: I8222b6716e1a709a7c00147315a3fa3636d59814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:14:52 +00:00
Bill Yi
598481dc76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df -s ours am: d4ba4def6a -s ours am: 0ebc9d790d -s ours am: d0e1438572 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801124

Change-Id: I6f69589b68b55c89846c2c69c9b61db8709946fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:14:46 +00:00
Bill Yi
45808ae4a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c -s ours am: dcd5353e67 -s ours am: a70fa93e6b -s ours am: 58119147f3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123

Change-Id: Iea2ea036cf7265564c10c6fe58f7f27cdcf3a136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:14:35 +00:00
Bill Yi
a3fc319181 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a -s ours am: 22ac363063 -s ours am: 340b85bb5b -s ours am: cb6e618de8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123

Change-Id: Ic0da7cce7b1078677ccbf143b3d010298d989afd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:14:14 +00:00
Treehugger Robot
875b1be363 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 0cb641a695 -s ours am: 46bd7feab6 -s ours am: 304324ddd0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: Ife399de8a85dbc27a4246d62dacf8b272f455e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:11:21 +00:00
Treehugger Robot
55c2d095cf Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9 am: 0b8d81c18c am: c4241ce611
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: I6169c4ed513ae43ab30e9764b0d54ad96fffb95c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:10:48 +00:00
Piotr Wilczyński
23ef7e7a3b Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 0066bdea3e am: 1ab96c0b22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848698

Change-Id: Iede2011f75063ca25002cbabf819f8a66ffa690f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:09:42 +00:00
Julia Tuttle
16015f0dfd Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: e2a8133da4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: I717e48fdec86ba3e1feb06ad3dea2b100a86cf1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:36:37 +00:00
Julia Tuttle
ff3d30a9b4 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: ce59e1ea97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: I7733171ec9db9f522bba6dad727cb766f178d4d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:34:15 +00:00
Julia Tuttle
03b06d6ff1 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: 4792f21e3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: Ic23004d25860bc1e7809587307131695c39665f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:33:43 +00:00
Becca Hughes
427665a90a [automerger skipped] Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659 am: 859df31fab -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: I2bc4d88c3619d37ccf7f27bf09d9de6dfbb7c393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:21:58 +00:00
Becca Hughes
f166cb9796 [automerger skipped] DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d am: 3107fb0f96 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: Ia35448dcdd12c68b89be1a32e8107103a8f3da94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:15:59 +00:00
Becca Hughes
58105270d7 [automerger skipped] Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 am: 6df62b695c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: Ia5921ff3db32de96dcec26c8a8c84badee51a3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:06:31 +00:00
Becca Hughes
b1b6edc4dc [automerger skipped] DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 am: 7378d6c66c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: I546ea077e306c793cc57ac9bb96dccd584db4f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:05:55 +00:00
Piotr Wilczyński
9797fc8d15 Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 0066bdea3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848698

Change-Id: I3f3058996ac6418ce8df4e888b0959830276ac31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:53:05 +00:00
Julia Tuttle
e2a8133da4 Merge "Update FSI permission strings" into udc-dev am: 2094622da9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: Ib07fb63100747c1486f3d0cdf9c80549be65a028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:49:23 +00:00
Julia Tuttle
ce59e1ea97 Merge "Update FSI permission strings" into udc-dev am: 2094622da9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: Id797e3f7b2f1dec78f0bc529da0156393a27d2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:48:39 +00:00
Julia Tuttle
4792f21e3d Merge "Update FSI permission strings" into udc-dev am: 2094622da9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: Ib02eef795ee140bb9241dadfb25749937fb8a774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:48:04 +00:00