Bill Yi
f7450d66d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957
-s ours am: 055f0b6e04
-s ours am: e963959f7d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I35da82f3031a336d572db0c9b33a90efd6374175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:27:18 +00:00
Bill Yi
edf781add5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441
-s ours am: 108e964377
-s ours am: 38089bf012
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: Iee8cae12872e3da158593e6a1ade4dc5fc713da1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:27:09 +00:00
Bill Yi
9d08b557f8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8
-s ours am: 9638eb7317
-s ours am: afddd403e6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613396
Change-Id: I754f5c73759f7a56e28434e498bbaf9c096713c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:26:56 +00:00
Justin McClain
7e837fae82
Remote authenticator enrollment navigation.
...
This change adds an entry point for Remote Auth enrollment and
navigation through the flow.
Bug: b/293906345
Test: make RunSettingsRoboTests -j40
Change-Id: I9bc803e24c4181ed73a0ef90b171897c677e71d1
2023-08-31 21:24:09 +00:00
Bill Yi
fbdc7a966b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours am: f3392e54a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I3e92b8f04419d31eb1997a5f6438ea1bd2dbc0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:20:00 +00:00
Bill Yi
c3cef770f3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1
-s ours am: 27207b8ba2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: Ib10329d36ed415d369fbe27f317eddef1d876c35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:19:57 +00:00
Bill Yi
e963959f7d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957
-s ours am: 055f0b6e04
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: Ifc042577ca929d532d0db4761d286ecdf3c4d50a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:19:52 +00:00
Bill Yi
38089bf012
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441
-s ours am: 108e964377
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I2968bf570eb33cb15503036c9e1b93ede45fb364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:19:45 +00:00
Bill Yi
afddd403e6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8
-s ours am: 9638eb7317
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613396
Change-Id: I3fd82df4c38901544df726772af0592ffd59359d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:19:29 +00:00
Holly Sun
0ec3b5035b
Move ShadownDeviceConfig.java to tests/robotests/testutils.
...
This is to solve the presubmit issue of ag/24543390.
Bug: 294858168
Test: build
Change-Id: I40c2ed7134676490d52aa63189dc16b3a7668a71
2023-08-31 21:07:25 +00:00
Vlad Popa
0127c488e4
Merge "Disable the spatializer options for device categories" into main
2023-08-31 20:48:06 +00:00
Bill Yi
f3392e54a5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: If4c3101451c5aa3e06093944bc4ca66c85f7fad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:38:40 +00:00
Bill Yi
27207b8ba2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I0e6468a14a5b7ee3adbfea9c7991d7d9b66941c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:38:37 +00:00
Bill Yi
055f0b6e04
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I29f9ea6a663bdf41a1ad350c3a7c972cee9ef445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:38:32 +00:00
Bill Yi
108e964377
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I178d00e9b8ae40cdf5544cfc44bf8a49318435c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:38:23 +00:00
Bill Yi
9638eb7317
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613396
Change-Id: I55cf63c9a4e5f691ed4a0ec52410e1d23e2d82c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:38:10 +00:00
Bill Yi
c09c1d68ed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours am: 7915da76ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I24dc6ea0b0a1681a25c122e4a4f90038b9e47661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:33:12 +00:00
Bill Yi
98d916e206
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1
-s ours am: 9fbe1abe61
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I064144b1f4be082bfb5e700d8751d9b46ded3413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:33:08 +00:00
Bill Yi
54befe6def
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957
-s ours am: 26a844a3ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: Ibcc698d1c702acd16b4183762e55b23024a6a1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:33:02 +00:00
Bill Yi
88df16782f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441
-s ours am: 45b4134bf1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I221772d405cb2c364b1cbe28d0e7743a0900fd1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:32:52 +00:00
Bill Yi
417a65279d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8
-s ours am: 90bf772f04
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613396
Change-Id: I6495c098512c0ed40718814dc067f99458b87947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:32:40 +00:00
Automerger Merge Worker
6f807ebf11
Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8
-s ours
2023-08-31 20:25:45 +00:00
Bill Yi
d1616c60a3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5a3df756ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: I71574c31470b8f5312fe52e693b8934f521f5167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:23:16 +00:00
Bill Yi
eaa92efd07
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb9037e6fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: I8c1d5fe34bfef41a0daa73f6e47309a6f5059b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:23:12 +00:00
Bill Yi
14442ba7c3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d3e67b615d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429
Change-Id: I44f10407d8a56ff717235e968662b746a0c0499d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:23:06 +00:00
Bill Yi
9725cfd44b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a5e445593
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429
Change-Id: I8421ae19dab74712004d41c4c79820e2635ab625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:53 +00:00
Bill Yi
14b51e0e37
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: Idd0d4bc53dbac3ec168c926670b5ffec6d40071c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:48 +00:00
Bill Yi
a00e01558c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I3e34dd6a79c327ba27c1384fecda62b6e54c212f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:44 +00:00
Bill Yi
7915da76ed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I9bc123329de313cd40aadc10b2d0eefae6d9a4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:42 +00:00
Bill Yi
9545ad3f39
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I9eb265c126c3476de84204c76888c21c25658566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:40 +00:00
Bill Yi
9fbe1abe61
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I3fadc615d02eb3ed8beb49cdbfe3a467121bcb39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:34 +00:00
Bill Yi
34d81dca78
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f8a434c4d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613427
Change-Id: I22e79e5b39cf9105f8143577980f9f2a4132fb3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:33 +00:00
Bill Yi
26a844a3ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I3a420b77ee401aa016d4c5e1ac1be5374f870481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:31 +00:00
Bill Yi
21c02da977
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I57fd58ff6a30701443b2930cc4db07e2d15cb6b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:29 +00:00
Bill Yi
45b4134bf1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613437
Change-Id: I1515bf6b868e1768f452d24555030abe2b702726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:18 +00:00
Bill Yi
4a693729ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613396
Change-Id: I43d21fba38300aa120186546740d2a54ca7f94ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:17 +00:00
Bill Yi
90bf772f04
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613396
Change-Id: I5794e3b34f808218e588c219996f810e8ec52cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:06 +00:00
Xin Li
f8a0c0323f
Merge UP1A.230905.019
...
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
Change-Id: I2a988e3da0958f31323f95588e1ac66482186ecf
2023-08-31 12:31:10 -07:00
Bill Yi
44ba06430a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-08-31 19:08:21 +00:00
Bill Yi
21335a6957
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-08-31 19:08:21 +00:00
Treehugger Robot
8f71e16aba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba09c7a937
-s ours am: 5dedf21e53
-s ours am: 7e60f1b6c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613398
Change-Id: I01da73eef47784ecf2d91744cb61aa546a0077ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 19:06:27 +00:00
Bill Yi
2f8e0ed969
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a6ff240a4
-s ours am: f30071fae2
-s ours am: 9aa9227a87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613398
Change-Id: Ifbad8db133d01e0ed450cba06fa52846a14790b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 19:06:16 +00:00
Bill Yi
b08e5bf7f9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c41647a3bc
-s ours am: d669bc5ec5
-s ours am: 79a837f0d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613397
Change-Id: I06592e149281066cd55c2b69a0497203bfecccfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 19:06:03 +00:00
Treehugger Robot
8661924803
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba09c7a937
-s ours am: e12be4e1ed
-s ours am: aaae85213d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613398
Change-Id: Ic22e0440517f37613c7448b0094694ce8dd02eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 19:01:51 +00:00
Bill Yi
f0d91f70d4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a6ff240a4
-s ours am: d0e7c0c54d
-s ours am: 1a10e72c45
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613398
Change-Id: I26790b9aec39f257b184d5f89bf2d2bdaf8183f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 19:01:41 +00:00
Bill Yi
b55a2aec63
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c41647a3bc
-s ours am: 93b69ed9ba
-s ours am: 18cf907648
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613397
Change-Id: I3492d52e54779fc977e8f21d904585c7c07ce381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 19:01:28 +00:00
Bill Yi
5a3df756ce
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2023-08-31 18:57:38 +00:00
Bill Yi
d3e67b615d
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2023-08-31 18:57:38 +00:00
Treehugger Robot
7e60f1b6c3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ba09c7a937
-s ours am: 5dedf21e53
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613398
Change-Id: Ic73915721bbb6a2166edc3818e9d989ba5eaea58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 18:48:59 +00:00
Bill Yi
9aa9227a87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a6ff240a4
-s ours am: f30071fae2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613398
Change-Id: Ifed73c735bdb660db27253ea3f5ca37189590556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 18:48:49 +00:00