Treehugger Robot
04f844c712
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559396
Change-Id: Ie1f7e796600b5ed714c99ae7fa74cf8455962030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:49:23 +00:00
Treehugger Robot
7db508358d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559401
Change-Id: Ibe15eeb22e5bb380ac29ab7b7d385a08c4cd9e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:49:16 +00:00
Bill Yi
5658802dd7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559401
Change-Id: I7dfcaf655c382e1ba273a13bbb47d983ff283839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:49:13 +00:00
Bill Yi
5e71a3fdf4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559396
Change-Id: Id98b771b0dbd7773b3574cbb6d65cacce5d72e4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:49:08 +00:00
Treehugger Robot
1882d8a87b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559396
Change-Id: I6c70cab4923ef2bf5e4cb8f2cd31b6ef4b73285c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:49:07 +00:00
Bill Yi
0748113064
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559396
Change-Id: Id9f8daa54ca8bca0920514ab1152afbde282f593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:49:04 +00:00
Treehugger Robot
f14e96fe88
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559244
Change-Id: I55893373046dc2d041b6b9fe8b5bba6ff4fd8b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:48:55 +00:00
Treehugger Robot
364b093b06
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559244
Change-Id: Ia7cf56815545de6448ccf14ce376a75b36757a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:48:50 +00:00
Bill Yi
4fdf445fc4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559244
Change-Id: I6f63c4860010286a27d32882b3f3bcdfb743c2ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:48:41 +00:00
Bill Yi
c68321c696
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559244
Change-Id: If6d5d2926bf2bd268a832ec8f05fa718967d3de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:48:24 +00:00
Treehugger Robot
059773bd86
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I03d8e31c1ab27742b95e0a528a135aa15db4e4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:46:16 +00:00
Bill Yi
284d320abb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I4e9438ad10906e729a3eafbb69410fa4ce011c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:46:11 +00:00
Treehugger Robot
763b15231f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I67802f22ec2b6c9181294a2bede4a125f59d9514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:43:36 +00:00
Bill Yi
32fce5403f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I635434e235c73d3db56a56183e0c9b442f2da8c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:43:29 +00:00
Treehugger Robot
ba4dc8f0bc
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-06 14:43:16 +00:00
Treehugger Robot
d8d85a8485
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-06 14:43:16 +00:00
Treehugger Robot
8c296cdd64
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-06 14:43:16 +00:00
Treehugger Robot
f996cfceba
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-06-06 14:19:16 +00:00
George
d41299016e
Correct typo in the launch via NFC bottom string
...
Bug: 283521954
Test: manual check the string
Change-Id: Ia32817ee1735831d0156a84ef7f48af94131dc73
2023-06-06 21:39:01 +08:00
Aleksandar Kiridzic
a882fd268d
speech: On-device recognition settings profile selector
...
`Settings > System > Languages > On-device speech recognition`
entry is currently proceeding to the settings page for the personal
profile by default. If a work profile exists,
a profile selector should be shown first.
Bug: 269575714
Test: Manual, already existing robotests
Change-Id: Id95a9716358ec3a813c77275bd65f0cbdfc9aefc
2023-06-06 14:10:34 +01:00
SongFerngWang
13cd052693
ForgetDeviceDialogFragment check whether device is null or not
...
Bug: 280687867
Test: build pass
Change-Id: I4134569854165f20f6287406d9ed627b2c15c05b
2023-06-06 09:53:36 +00:00
Treehugger Robot
2168824eba
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: d05997872a am: 2237bd2d6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: I574474239367f71e23303252ce35317b8cbc54fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 08:03:46 +00:00
Treehugger Robot
e2892a70dc
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: ae50f4d0e6 am: ed2f0ccb0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: I06743a0141833c157973c11ada377c8106175c10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 07:59:09 +00:00
Treehugger Robot
e5e57499b8
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: d05997872a am: b0df718bae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: If6e3d192523e9ae43ff157234e8a9c4193adb0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 07:58:28 +00:00
Treehugger Robot
ed2f0ccb0b
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: ae50f4d0e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: I03e173717694632d6dd2ee02f1e16813b49cf1b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 07:21:39 +00:00
Treehugger Robot
2237bd2d6e
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: d05997872a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: Iac12a1a635d0aab70b994f49a18b4914aa0d412e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 07:20:29 +00:00
Treehugger Robot
b0df718bae
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: d05997872a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: I3af28ff3dcbb096e8376d0983cbfd54ce73f72b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 07:16:22 +00:00
Treehugger Robot
d05997872a
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: Ice47c201387d778d3bee0aa239fdd3b3eb59a031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 06:38:00 +00:00
Treehugger Robot
ae50f4d0e6
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968
Change-Id: Ia2d93b574bf5a744d129558e92f19fa5229486a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 06:33:51 +00:00
Treehugger Robot
185244f43d
Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev
2023-06-06 05:49:40 +00:00
Alejandro Nijamkin
6f9f3a4594
Fixes nav stack issue.
...
By marking the Intent that's being sent to WPP as "launched from
settings", the code in CustomizationPickerActivity can correctly
conclude that the multi-pane wrapper does not need to be applied to the
intent, preventing the odd "disordering" of the back stack in the bug.
Fix: 284809020
Test: manually verified, on a large screen device with a multi-pane
settings configuration, that going to Display > Lock screen > Shortcuts
and then swiping back off the left edge of the display correctly exits
settings instead of revealing an incorrect screen like it did in the
bug.
Test: also manually verified that the long-press on the home screena and
on the lock screen paths both open the right tab in WPP in settings
correctly.
Change-Id: Iac2b4e9fa5bab91b6a5251f1c51b4d21a0824f00
2023-06-05 16:02:17 -07:00
TreeHugger Robot
beaf62c888
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours am: 8f5a0bc281 -s ours am: 9c6d0441b1 -s ours am: db9add5106 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: If52be8d613753cf187435f6605f21c7412cfd362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 22:06:08 +00:00
Bill Yi
6ff4c4f3da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours am: a18807d9ca -s ours am: 0db4720d61 -s ours am: 125d5904d2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: Icb8b432bdac680d648de30bfe607d3c4e8e52ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 22:06:04 +00:00
TreeHugger Robot
db9add5106
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours am: 8f5a0bc281 -s ours am: 9c6d0441b1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I9f34dfee4207dfed4f878da7b74b9bc2a2fff28f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 22:00:56 +00:00
Bill Yi
125d5904d2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours am: a18807d9ca -s ours am: 0db4720d61 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I70329448461065afe228f17a4c96e334a69df6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 22:00:53 +00:00
Treehugger Robot
2ccc970989
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6cb0b2c68e -s ours am: fc0e5b8a0c -s ours am: 58ccdb7f48 -s ours am: 6eb3ba882a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: Icdbbb0c3a9096307d1f218bc33fff19922e496d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:59:32 +00:00
Bill Yi
3ae4845dd1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cb99dd3e3 -s ours am: eabe8621e3 -s ours am: 0a3eb6c5ba -s ours am: d08542f649 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: Ie04dad3f11e6314c9e67cac0bf3c0c61d46375fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:59:15 +00:00
Bill Yi
da41afac9c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59cfc8ae14 -s ours am: e68afc2727 -s ours am: 63067fce6e -s ours am: 5df607d81f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556174
Change-Id: I93185d1e10fa4deae189ca7d46d74e2a511c39e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:58:58 +00:00
TreeHugger Robot
266708ca2c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours am: 8f5a0bc281 -s ours am: 0741621536 -s ours am: 2856b252d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I557ab3215b85fe01192f54d3eb17f9a3c49330f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:57:01 +00:00
Bill Yi
1b40614229
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours am: a18807d9ca -s ours am: 556351d016 -s ours am: 1286e7ab43 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I889cc510bb0eb57981128a7ccdf4b43291832824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:56:59 +00:00
Automerger Merge Worker
c8acbf2fd6
Merge changes from topic "am-6cc4fe5fab0148828467f72cff0ecff5" into udc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f8f5a0bc2810741621536c80daa5759b80d56cfc0a18807d9ca556351d0161fa02de776
2023-06-05 21:56:20 +00:00
TreeHugger Robot
fd9b1dd3e4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours am: 8f5a0bc281 -s ours am: 0741621536 -s ours am: c80daa5759 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: Ibc6eb594951fe3f8ba6f0fa6f7f82278904111ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:56:11 +00:00
Bill Yi
e06033f483
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours am: a18807d9ca -s ours am: 556351d016 -s ours am: 1fa02de776 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281
Change-Id: I7eb2b90abc8905be6114feb831bc0796fa782482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:56:07 +00:00
Bill Yi
0e15c95689
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours am: aeacaaee64 -s ours am: 6f0fe3ef25 -s ours am: 586019ca54 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235
Change-Id: I4f87f143f07385ff699f237fffe76042df00bfe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:55:49 +00:00
Bill Yi
cfbc70747e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours am: aeacaaee64 -s ours am: 6f0fe3ef25 -s ours am: 6804100740 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235
Change-Id: I6e4ba84603a69c9df9cb859a63ce3ff948429d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:55:05 +00:00
Treehugger Robot
6eb3ba882a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6cb0b2c68e -s ours am: fc0e5b8a0c -s ours am: 58ccdb7f48 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: I392abe3227228aa5339c9cedf3ce7a5d12d7ce40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:51:53 +00:00
Bill Yi
d08542f649
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cb99dd3e3 -s ours am: eabe8621e3 -s ours am: 0a3eb6c5ba -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: Ia5062e5ea1c07b650caa2dd03189927b317a66df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:51:37 +00:00
Bill Yi
5df607d81f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59cfc8ae14 -s ours am: e68afc2727 -s ours am: 63067fce6e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556174
Change-Id: I1f08c5a16fdbd639cc058129a0d699382d3cc7e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:51:19 +00:00
Bill Yi
66a09fa2d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours am: 0813a0de64 -s ours am: 3f370e8a21 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: I8406905be0eea0c8922985b4b7f8929faae9bcef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 21:50:45 +00:00
Automerger Merge Worker
957d5dcce7
Merge changes from topic "am-83fb4ab6e7314229b5ecf602fd7d3290" into udc-qpr-dev-plus-aosp
...
* changes:
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237aeacaaee64df0a3a65343777d18917fe27600237aeacaaee649789ce21f54ee9a3b7f0
2023-06-05 21:50:29 +00:00
