Commit Graph

135357 Commits

Author SHA1 Message Date
Bill Yi
1f47c55166 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours am: 1840690d24 -s ours am: 02f11dcb34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I146a3865b925d66e5378d85a0cde381d4bca0e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:24:05 +00:00
Bill Yi
3eca78debd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours am: 49e318ce55 -s ours am: 245712159f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7cb322a355234997d09b722d001f2b9f3052c7a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:48:10 +00:00
Bill Yi
2d856f42cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 250f3c8c9b -s ours am: 3cf873896e -s ours am: 1fd629396d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib787c46e604163528cd721c7b428784d6d6fa930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:48:07 +00:00
Bill Yi
aeb53231b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 44adc2b02a -s ours am: 465cf9500b -s ours am: 35d51f1fc8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd6a441644f129a472e5241cc4f22358eaa50f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:48:04 +00:00
Bill Yi
3f02db9afd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: 1605dfab0b -s ours am: 779bd81952 -s ours am: a80e2a969d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I751868270d0990b8f7f6d2ae8454087162407f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:47:54 +00:00
Bill Yi
9459f3f372 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: 02cdab0a91 -s ours am: cc92c9228e -s ours am: 6f48b8c62c -s ours
am skip reason: subject contains skip directive

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

Change-Id: If8299adb6c901d1fa389c6c0acf229687bdcdfe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:47:42 +00:00
Bill Yi
18049682bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours am: f673fe0435 -s ours am: 1d28dfd4f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91f14c6155406517659b1ef6e9b1d45174febc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:42:29 +00:00
Bill Yi
19d2a3b691 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 250f3c8c9b -s ours am: efe7e127be -s ours am: eb656e8c71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f8b6841a636113bcadc92568f95fb4921dd5c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:42:27 +00:00
Bill Yi
953ab91289 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 44adc2b02a -s ours am: a40e89c5a5 -s ours am: 7c6d9f85cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I24a9840710e4abe081c85430f8b01688d0474607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:42:20 +00:00
Bill Yi
4f1a5cf2a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: 1605dfab0b -s ours am: 11ed798977 -s ours am: 98ac0b381f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id9bd3282a3d8cfc0e90ec2a0f382b140acbdd129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:42:06 +00:00
Bill Yi
b5f6094ec8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: 02cdab0a91 -s ours am: b6e2010daf -s ours am: 936c8519c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69d17ea14c288ca7c477ddfcbb19eaee310ca2bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:42:01 +00:00
Bill Yi
0f29b9bc51 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: cca1e959ee -s ours am: 2e4673500f -s ours am: dc44ac77cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id4fe828d075369b73a22c96b7c3975621fafde78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:34:42 +00:00
Bill Yi
6a9d166bcd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 4e2f191fe5 -s ours am: df9839f6d9 -s ours am: 7e7efd0f80 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9afd2275f926f7397afc643439268cf01da9d31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:34:38 +00:00
Bill Yi
ffaca8c1c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 64677e15d9 -s ours am: 8f1383cba3 -s ours am: aa2ae14f84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1970b353561930c6c79f19b8ac9c53a2aad00f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:34:35 +00:00
Bill Yi
674f6bde06 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: ebedb167fc -s ours am: 28743336b7 -s ours am: 73006ce3e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0f95a1174cae3739e3a3fd1ff87af646ba76fa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:34:19 +00:00
Bill Yi
b8ce7243d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: b1e0ae99ce -s ours am: 8c3f41b3f7 -s ours am: 588c5b7c9d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I359eb5189e7433e612e23a384865050031f2a0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:34:02 +00:00
Joshua Mccloskey
48621c5aea Merge changes If2fc46b1,Ib54da7a8 into main
* changes:
  Add enroll() in FingerprintManagerInteractor.
  Fix SettingsV2 tests.
2023-09-15 16:03:04 +00:00
Chaohui Wang
14655b03fb Merge "Fix AppInstallerInfoPreferenceTest flakiness" into main 2023-09-15 15:57:50 +00:00
Elliot Sisteron
f348c2c0b6 Merge "Handle "Blocked by your IT admin" better." into main 2023-09-15 14:19:32 +00:00
Manish Singh
8cef63acc1 Merge "Remove temp workaround for feature flag" into main 2023-09-15 10:13:01 +00:00
Chaohui Wang
5b439a3f44 Fix DevelopmentSettingsTest
And MoreWirelessSettingsTests.testVPNMenuLoad

Bug: 290684887
Test: ui test
Change-Id: I37ef70d1f6f75cd1721ab9ba0763f7ec20be80d0
2023-09-15 12:15:39 +08:00
Chaohui Wang
d835649147 Merge "Extract app data usage to AppDataUsageRepository" into main 2023-09-15 03:00:53 +00:00
Chaohui Wang
fc7a1e01a9 Merge "Clean up SettingsUnitTests unused dependencies" into main 2023-09-15 03:00:21 +00:00
Bill Yi
02f11dcb34 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours am: 1840690d24 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieeaaa0c114a69476a895e4f6d6019f7d8c8856e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 02:54:20 +00:00
Bill Yi
1840690d24 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I615e552bbb37ead26fd91021e6a25f556355de02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 02:15:17 +00:00
Bill Yi
9b966ddf8c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 55b68c4df3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib155354696cf60096c363f3117ac8e620fde6a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 02:12:06 +00:00
Bill Yi
05f3d4b9fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 283a8d5d40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19a6cfcb1e2b3648198745a61f9f5680a26e6d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 02:11:52 +00:00
Bill Yi
55b68c4df3 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-09-15 01:30:30 +00:00
Bill Yi
73b5df4147 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-09-15 01:28:22 +00:00
Bill Yi
ee8b667a13 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-09-15 01:28:22 +00:00
Bill Yi
3c7144c4a5 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-09-15 01:28:22 +00:00
Bill Yi
245712159f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours am: 49e318ce55 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia76fd5f02f01cbc650ccaae6aa112bc107a22019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 01:06:24 +00:00
Bill Yi
1fd629396d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 250f3c8c9b -s ours am: 3cf873896e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55453a7c21d862ecd36efe8779f7b6dc7c0ca331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 01:06:20 +00:00
Bill Yi
35d51f1fc8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 44adc2b02a -s ours am: 465cf9500b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I334e6b2d5495c62412d7d0524672beee3053e354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 01:06:15 +00:00
Bill Yi
a80e2a969d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: 1605dfab0b -s ours am: 779bd81952 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I271f5bba8be97e85960f150509adc966818d6f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 01:06:03 +00:00
Bill Yi
6f48b8c62c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: 02cdab0a91 -s ours am: cc92c9228e -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6d1d59024877d4fada2d1f52786b417a29b8b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 01:05:49 +00:00
Bill Yi
1d28dfd4f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours am: f673fe0435 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4fe3bc9b8c59a96e895381bb315caeadbf54d77d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:27:09 +00:00
Bill Yi
eb656e8c71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 250f3c8c9b -s ours am: efe7e127be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I271a77de0eb131e87203ad49dd96e99527a8300c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:27:06 +00:00
Bill Yi
7c6d9f85cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 44adc2b02a -s ours am: a40e89c5a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbced1dd8f1f8d2f0bc6519803b6c0a7bc9ab49e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:27:01 +00:00
Bill Yi
98ac0b381f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: 1605dfab0b -s ours am: 11ed798977 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief2f9f3a220bd42731500e5ba6c4199b701f0b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:26:53 +00:00
Bill Yi
936c8519c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: 02cdab0a91 -s ours am: b6e2010daf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1037f6c1b71ab407402930277989bee031132b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:26:36 +00:00
Bill Yi
49e318ce55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I71950de434f3e8af54f2d2221a38b3418cae25b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:23:21 +00:00
Bill Yi
3cf873896e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 250f3c8c9b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iedddcd51dee7f8cac11241d71385fd90a6cd7196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:23:17 +00:00
Bill Yi
465cf9500b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 44adc2b02a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf5428fdb752b9cdaaebf326a10c7993b8e1b2b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:23:12 +00:00
Bill Yi
779bd81952 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: 1605dfab0b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id85817fee917109f8fe6b2b0b839889404347e0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:22:56 +00:00
Bill Yi
cc92c9228e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: 02cdab0a91 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I58024eeab57c1c647b28d81e138be9b0fc9a2b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:22:40 +00:00
Bill Yi
f673fe0435 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0388bc4a64f7484dfacd6fc841f8a50325c3846f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:14:50 +00:00
Bill Yi
efe7e127be [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 250f3c8c9b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie31de40434fbac918d70a5d2c74398ba1756e41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:14:47 +00:00
Bill Yi
a40e89c5a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 44adc2b02a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iafc3897cfa155d9e861483cdc4481405e5f13334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:14:41 +00:00
Bill Yi
11ed798977 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: 1605dfab0b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f630c2d5d4b9fdb6fff945c570aeae479fe5ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:14:30 +00:00