PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,704 Commits 1 Branch 0 Tags
202b3b147b1f1ff0679ea5ba2bc00ffe6b80132c
Commit Graph

129704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
409a6b2492 Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: Id95f85e07c45a722a5229507be58cb582ca3587e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 01:11:05 +00:00
Treehugger Robot
b06310a63f Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: Id02586892e1b22d8450098323183c1ad33ca8574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 00:38:18 +00:00
Treehugger Robot
4b0bf8f98d Merge "Clean up obsolete aliases for Truth." into main 2023-10-11 23:59:17 +00:00
Krzysztof Kosiński
665b151f87 Clean up obsolete aliases for Truth. 
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
 2023-10-11 23:10:01 +00:00
Krzysztof Kosiński
15e17e0119 Clean up obsolete aliases for Truth. 
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
 2023-10-11 19:41:36 +00:00
Eric Biggers
e249035b89 [automerger skipped] Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd am: 12c1013250 am: c44a165ec7 am: 15c5cd2478 -s ours 
am skip reason: Merged-In If196bbef4755c644b3188043ed47e99817bf1856 with SHA-1 938902d2df is already in history

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

Change-Id: I71396e731f92073d32644f991cc5deaa6e1dc8e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 22:54:23 +00:00
Eric Biggers
15c5cd2478 Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd am: 12c1013250 am: c44a165ec7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713

Change-Id: I344e3a8d2a8a3e6cdb9056a9b06a7fe5b6b5741a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 21:51:41 +00:00
Eric Biggers
c44a165ec7 Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd am: 12c1013250 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713

Change-Id: I3c6492ee12dc88b518079e167583b37435743d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 21:18:01 +00:00
Eric Biggers
12c1013250 Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713

Change-Id: Ib504b453a8caac0789084affcaa70a33e8b554d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 20:11:52 +00:00
Eric Biggers
b862d378bd Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main 2023-10-10 19:43:59 +00:00
Graciela Wissen Putri
e6c4beca80 Remove 4:3 aspect ratio option for foldables 
Bug: 304260896
Test: atest UserAspectRatioManagerTest
Change-Id: I8a745c90e45e8776eef082e01dc2155fe6b353b6
 2023-10-10 17:18:48 +00:00
Eric Biggers
938902d2df ShadowLockPatternUtils: remove patternEverChosen methods 
These methods are being removed from LockPatternUtils because they are
no longer used, so remove them from ShadowLockPatternUtils too.

Bug: 270013005
Change-Id: If196bbef4755c644b3188043ed47e99817bf1856
Merged-In: If196bbef4755c644b3188043ed47e99817bf1856
(cherry picked from commit 795a02c92a)
 2023-10-10 05:29:21 +00:00
Cassie Wang
760712201e Add a config to show the Vpn options menu. 
Bug: 290124499
Test: m -j32 Settings
Change-Id: I14d59b656e917f6fb7a495f14297c594a115c018
 2023-10-10 13:07:00 +09:00
Automerger Merge Worker
97246649e4 Merge changes from topic "am-ed5d77f7685c443197cbca230cef63e8" into udc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: eaeb26adb0 -s ours am: ea17648df4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: 109fbe94d7 -s ours am: 5faf8d80c9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 2df55e14e4 -s ours am: 26f905aea0 -s ours
 2023-10-10 01:38:51 +00:00
Automerger Merge Worker
656d481e18 Merge changes from topic "am-a5286f069992436fa3bf3e411ca3a093" into udc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours am: f7b330feac -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours am: a4e1dd587c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours am: f67e1b0f26 -s ours
 2023-10-10 01:37:11 +00:00
Bill Yi
1c503fed67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: eaeb26adb0 -s ours am: ea17648df4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I535c548c0dd8f36ea535afe5cbf6ba1b93e0887d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:36:55 +00:00
Bill Yi
fa5ac0872d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: 109fbe94d7 -s ours am: 5faf8d80c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic89ddcbeb378e22a233d15fed842e93d550c2aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:36:48 +00:00
Bill Yi
573c101095 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 2df55e14e4 -s ours am: 26f905aea0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d133f40becc7f75fb8c61d320c52f17caad4fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:36:27 +00:00
Bill Yi
f5617ef79d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours am: f7b330feac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I794b63cdb4c5a5da0f5ee8887903f89def325210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:32:57 +00:00
Bill Yi
2b4eba117b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours am: a4e1dd587c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a29fa615c0dad12dbe7ced8f68dc75207dbcf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:32:45 +00:00
Bill Yi
1c03b73998 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours am: f67e1b0f26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3e1723d543331ba49f7c29b9a1a7293ff8de868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:32:29 +00:00
Bill Yi
83ca01c4cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours am: 292fb5da73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8762d02906de08b38a0299488a5d68dfad20b59c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:32:05 +00:00
Bill Yi
e60a24fbb3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours am: fa9aef9061 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I340d935e94774b5a0bbe2eb1e2f30e6a24c25d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:31:55 +00:00
Bill Yi
ee91548952 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours am: c01f48c623 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99a3e1662962c9bc00465bac19fad9890e593f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:31:39 +00:00
Automerger Merge Worker
5fbadb8fbb Merge changes from topic "am-b81a4115f8fa4d15bcbc4e5bc8733990" into udc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours am: 9a58b15803 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248 -s ours am: 0b8fb9bf01 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8 -s ours am: 6c8252e6fa -s ours
 2023-10-10 01:30:33 +00:00
Bill Yi
68dcc0800a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours am: 651aaef998 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0954c56e681eea898e38a76b61dc283cca4c8e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:26:43 +00:00
Bill Yi
affc6a9688 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248 -s ours am: 84970745cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f8ebaae898d447aaab09e2644591e6539831777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:26:31 +00:00
Bill Yi
211c0a6bb2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8 -s ours am: fc51d3d77a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iace4128a50e6ad86077c7779eaf7e658eb6186b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:26:16 +00:00
Bill Yi
1f9a5c2e17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours am: 9a58b15803 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1e45e4ed269879aa39630ceb08d0f0966a33d26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:25:57 +00:00
Bill Yi
456d4cb9f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248 -s ours am: 0b8fb9bf01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie784f8e9d0fff6326ea107ed4085093d422f478b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:25:49 +00:00
Bill Yi
ea17648df4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: eaeb26adb0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7c189d95598eed503e96a109f03e79123406799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:25:34 +00:00
Bill Yi
9df69f1f12 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8 -s ours am: 6c8252e6fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icde5bee08f5ffce8283aace7b67f53ee0e327ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:25:30 +00:00
Bill Yi
5faf8d80c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: 109fbe94d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d0bdf241b4819096f50dfe571b52932c86a7b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:25:24 +00:00
Bill Yi
26f905aea0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 2df55e14e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia44f3b174d7343bf423c08469cb8eca8582953e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 01:25:07 +00:00
Bill Yi
f7b330feac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a7a5153250df9443076617ce3932d2a59773cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:16:00 +00:00
Bill Yi
a4e1dd587c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4cc49415609542c0a0ba8aed4c323fcf5cb0c3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:15:49 +00:00
Bill Yi
f67e1b0f26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I170ade0484ffaedee08fbb8032ea4f21a98c079f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:15:34 +00:00
Bill Yi
9a58b15803 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdc00cfc887bb008f0656f5846f66aa8a5bd6d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:11:55 +00:00
Bill Yi
0b8fb9bf01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe4fc099db631e426de1434e21a64d699c9b3677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:11:45 +00:00
Bill Yi
6c8252e6fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc0ee1cf6df0f789bb642e600cf907282b801a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:11:29 +00:00
Bill Yi
292fb5da73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 1e702e6f83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic38d4f4db764b5823f8d03e12b591fee292f0ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:09:50 +00:00
Bill Yi
fa9aef9061 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: eb51dfd4e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5a6a16d80ecab22ed4a71e48a80127b3fad671b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:09:39 +00:00
Bill Yi
c01f48c623 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 84ed68cd4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d89f060276f9dd3cedb55e826e847cd4cb172f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:09:23 +00:00
Bill Yi
651aaef998 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7521add4b3e9244f740aabdcc9e8f3522a241ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:03:40 +00:00
Bill Yi
84970745cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I681f21aaaaa01319e1db9c24d8b7ac3b09f32695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:03:29 +00:00
Bill Yi
fc51d3d77a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I592ac71ca5536f9d7e1a736326af4871deb26413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:03:13 +00:00
Bill Yi
1e702e6f83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c69f07f7543d7ddae95397cf382e520282cdb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:01:52 +00:00
Bill Yi
eb51dfd4e9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib51cd595a7b5286b9dc1643ee606baeec5d6a0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:01:37 +00:00
Bill Yi
eaeb26adb0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e63e108831ddddb6617486a291e4964587c0326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:01:26 +00:00
Bill Yi
84ed68cd4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6595f8966ef1394544032078b8af6c1b981c1cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 00:01:25 +00:00