PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,189 Commits 1 Branch 0 Tags
c64b61c4b994ea37f0f016e003cd2cbffaea2c5a
Commit Graph

110189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
53a0ea397e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: 9f3d909380 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e204d199cc0a79269319d37c65ceb54b6fe7b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:36:41 +00:00
Bill Yi
5edb7526a5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: f8a50b4b89 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d8497a1d6da4831233f63ff6881006e1a44e767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:36:25 +00:00
TreeHugger Robot
6fd7cf1993 Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I6c7835e9885cf02ba167a8f4ac1c564bad511e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:34:09 +00:00
TreeHugger Robot
f4222dcc73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours am: 5d47633192 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaf07e2725ee1f2fb548b1ac660ae95c6ae0fa6a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:27:53 +00:00
Bill Yi
3e24500fcd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours am: f52d81e8cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1541fff9375593cc72782ce20a69770663450b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:27:37 +00:00
Zoey Chen
09b6827884 [Le Audio] Remove the redundant resId 
Test: manual
Bug: 214340362
Change-Id: I41dc198384a1b1f67b009f38907fb84eb754c3c0
 2022-06-02 07:19:51 +00:00
TreeHugger Robot
e3bbadb7df Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: Ia3a38063419fccfc6e1be8135180a3a433ebbd23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:15:36 +00:00
TreeHugger Robot
bf8f3193d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45c604d81e17f32008d09e8d6268f7ff98c812ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:02:53 +00:00
Bill Yi
f8a50b4b89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie867abf082d0eb78a26650398c2a8ad89ccdb68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:02:36 +00:00
TreeHugger Robot
5d47633192 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2a0f2689e3926da7ab3104ef2e6e25e7fd5b5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:02:26 +00:00
Bill Yi
f52d81e8cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I105bce0dac4f64afb5953259df915d4d4782492a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:02:09 +00:00
TreeHugger Robot
5814c94856 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2dd22a060a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74bffca5423b7133667656b3b5c51414c4116b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:02:03 +00:00
Bill Yi
9f3d909380 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a398405a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36c79903c3627740db02324ee6623160773505c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 07:01:42 +00:00
TreeHugger Robot
2f184b0ff4 Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev 2022-06-02 06:52:53 +00:00
TreeHugger Robot
2dd22a060a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-02 06:41:58 +00:00
TreeHugger Robot
d758389b0c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 25baef57f3 -s ours am: 252a90a436 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc2c92e6867325cdef2206a356a87671853b9b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:42:44 +00:00
Bill Yi
75b9751ce9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95fe5f3db6 -s ours am: f4bec94c15 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21ca250ca6f45395d29f0de0db7d20f8a1971ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:42:22 +00:00
TreeHugger Robot
b9f736ed1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4704f5c76f -s ours am: 925af537da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97a3e3d1ba6931988c987280cf7e3d97846bacb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:42:00 +00:00
Bill Yi
2b9a592a1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4155618946 -s ours am: c25b7fed35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17751ac53bb08f5fcb59e7d1fbbabde7ac87ece3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:41:40 +00:00
TreeHugger Robot
252a90a436 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 25baef57f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff08c5702b6dad1109e5960495515cc38dee8319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:33:40 +00:00
Bill Yi
f4bec94c15 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95fe5f3db6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iffc5ee3633d07de4070eb4de8bf4849bad12a5a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:33:13 +00:00
TreeHugger Robot
925af537da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4704f5c76f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93c50186abba714d36640bd181ac39001b491749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:32:50 +00:00
Bill Yi
c25b7fed35 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4155618946 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3715f2bce2394df5c830483b03aa7370f758458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:32:28 +00:00
Betty Chang
e133317dd7 [automerger skipped] Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 am: d131bdfbec -s ours am: 397b8e1944 -s ours am: cefc2233db -s ours am: 67d6e25e92 -s ours 
am skip reason: Merged-In I830efc3514fc42aaa4e53f491ed3a7459bd9bb41 with SHA-1 a56e198c61 is already in history

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

Change-Id: Ib7f895aba3bb9e846150d7ca126a165507e76ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:32:27 +00:00
TreeHugger Robot
25baef57f3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-02 05:15:53 +00:00
TreeHugger Robot
4704f5c76f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-02 05:15:53 +00:00
Betty Chang
67d6e25e92 [automerger skipped] Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 am: d131bdfbec -s ours am: 397b8e1944 -s ours am: cefc2233db -s ours 
am skip reason: Merged-In I830efc3514fc42aaa4e53f491ed3a7459bd9bb41 with SHA-1 a56e198c61 is already in history

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

Change-Id: Id406c5775233f6c6b56fea3a4d248105915cc871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:13:54 +00:00
TreeHugger Robot
3f205a646e Merge "Add Settings for back animation developer option" 2022-06-02 05:13:31 +00:00
Betty Chang
cefc2233db [automerger skipped] Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 am: d131bdfbec -s ours am: 397b8e1944 -s ours 
am skip reason: Merged-In I830efc3514fc42aaa4e53f491ed3a7459bd9bb41 with SHA-1 a56e198c61 is already in history

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

Change-Id: I68356e1c991a3ede129c97ebc1f06f1b8a9df91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 04:56:32 +00:00
Betty Chang
397b8e1944 [automerger skipped] Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 am: d131bdfbec -s ours 
am skip reason: Merged-In I830efc3514fc42aaa4e53f491ed3a7459bd9bb41 with SHA-1 a56e198c61 is already in history

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

Change-Id: Ifa7c9df20a76fe233a4b48f2de06ef6a6774cbfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 04:17:58 +00:00
Betty Chang
d131bdfbec Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2113244

Change-Id: I4d58377302a60869bce6cd4d2a70a6f61d35e752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 04:01:11 +00:00
Betty Chang
e3295efcd0 Merge "[LE Audio] Broadcast Sink UI" 2022-06-02 03:34:59 +00:00
Chaohui Wang
4e32ab60d4 Merge "Clean up unused string resource sync_plug" 2022-06-02 03:19:49 +00:00
TreeHugger Robot
6c2f9458de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f198f55543 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia823d2ded7c820ceae93752088805e43b7e70d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 02:18:21 +00:00
TreeHugger Robot
b0888ecfae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 4a8654a687 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbc8e296d75c1a1de463821b7dd4187b3a2b702f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 02:16:17 +00:00
TreeHugger Robot
f198f55543 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-02 01:56:17 +00:00
TreeHugger Robot
f658104418 Merge changes from topic "tc_change_22060107_28" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a571f069ee
  Import translations. DO NOT MERGE ANYWHERE
 2022-06-02 01:56:17 +00:00
TreeHugger Robot
4a8654a687 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-02 01:56:17 +00:00
TreeHugger Robot
3adaaba220 Merge changes from topic "tc_change_22060107_28" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac0cd8d7ff
  Import translations. DO NOT MERGE ANYWHERE
 2022-06-02 01:56:17 +00:00
TreeHugger Robot
39dfb8038e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: 4a0fa16423 -s ours am: 72792c9c10 -s ours am: 1159c2f7c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia77d02695dd6947d6cf191c9973b58cecc68adcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:25:55 +00:00
Bill Yi
7778488682 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 63f15c33d9 -s ours am: 8caffec284 -s ours am: 82c5c11827 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4360f285f0c87534403cec6667265c9ef403b775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:25:35 +00:00
Automerger Merge Worker
0e799ff6d9 Merge changes from topic "am-19c8f316ee894aa0a901506f702ec1fb" into tm-qpr-dev-plus-aosp am: 0029cf5ffa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18695280

Change-Id: I0230a2e4d1144b17ed8f521d52f4c9f539fab97d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:19:15 +00:00
TreeHugger Robot
e0035b2603 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -s ours am: 6c801a5454 -s ours am: 428e03d24a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41e7ce5804e8eb0039476a60bb81f63ecaf815f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:18:59 +00:00
TreeHugger Robot
ba2a41219e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -s ours am: 73bfce4c4c -s ours am: 4030de6046 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f9b2a758a48d4a7ad19a02f00af33952e5506d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:13:18 +00:00
Bill Yi
1f3ed7d8ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 785071f7aa -s ours am: 237335386d -s ours am: 86aa7618cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22d58c51a860dc902c00d8fffbcfd3bf6db5c9b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 01:12:59 +00:00
TreeHugger Robot
1159c2f7c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: 4a0fa16423 -s ours am: 72792c9c10 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If15e3bf7bd9adafb2be88c1860395a250176f96b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:50:20 +00:00
Bill Yi
82c5c11827 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 63f15c33d9 -s ours am: 8caffec284 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d56bb78737a15ac1261af04940ad1ece4a76678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:50:03 +00:00
Automerger Merge Worker
0029cf5ffa Merge changes from topic "am-19c8f316ee894aa0a901506f702ec1fb" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -s ours am: 6c801a5454 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 785071f7aa -s ours am: 5f961ab2f5 -s ours
 2022-06-02 00:48:27 +00:00
TreeHugger Robot
428e03d24a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9d995e75a7 -s ours am: 34534c87b2 -s ours am: a543e38931 -s ours am: 6c801a5454 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f4fd3be721985779979345e717162a0bdc66939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:47:38 +00:00
Bill Yi
fcb7dc5743 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3d586794b -s ours am: 95fef514c3 -s ours am: 785071f7aa -s ours am: 5f961ab2f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic92d95d9ec2726eec4a181919e43f0e41b633452
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 00:47:20 +00:00