Simon Wingrove
ef498ef53d
Distinguish multiple PendingIntents via requestCode am: 25686219d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19289844
Change-Id: Id8509feac060578cf8d7ffb4d7a7b9def221f029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-18 19:19:15 +00:00
Simon Wingrove
25686219d3
Distinguish multiple PendingIntents via requestCode
...
Settings uses a system of intent extras to open subsettings pages. When
PendingIntents are created from these Intents, the system does not think
they are unique as extras are not included in this equality check. So
only one of them is likely to work.
A unique request code can be used to distinguish between them.
Bug: 238605613
Test: atest LockScreenSafetySourceTest
Merged-In: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
Change-Id: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
(cherry picked from commit f2b0cedcd0
2022-07-18 11:18:28 +00:00
TreeHugger Robot
326c0ea30c
[conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19291449
Change-Id: Ifce8e49a098d2e745f15348eb2d318d347366e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2022-07-16 09:09:57 +00:00
Sorin Basca
b9503775c0
Use Mockito 4.6.1 API
...
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit 61e0bcd194
2022-07-16 07:57:52 +01:00
TreeHugger Robot
e0f3ec193b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7afae4bac1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294497
Change-Id: Iea692e5126ada63d0ca4aa91bd83570f3ddf325a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-16 06:46:32 +00:00
Bill Yi
4c171b21e8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0f98a4d1ca -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294497
Change-Id: I5c0e23ba0c57b9e5d69c6107d2c1421bd747e76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-16 06:46:06 +00:00
TreeHugger Robot
cd107313cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9e97c811a8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294493
Change-Id: Ieebc2eba1f675bba4cb40037f5639b3cb6bc179a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-16 06:45:41 +00:00
Bill Yi
aa37dd1860
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e148a29a1c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294493
Change-Id: I2c38c15ab224ca98b6911c70f54ac8a07e59f1e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-16 06:45:20 +00:00
TreeHugger Robot
7afae4bac1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-07-16 06:32:58 +00:00
TreeHugger Robot
9e97c811a8
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-07-16 06:32:58 +00:00
Treehugger Robot
dad4720a31
Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780
Change-Id: Iaa69c78ca9535382935688f7d9b41724c3f179ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-16 03:21:01 +00:00
Treehugger Robot
2a0a88af4d
Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780
Change-Id: I6ba5b7c40e87df6c231e0c774913b1320c9c3996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-16 02:51:11 +00:00
Treehugger Robot
e705fcd7c3
Merge "Fix incorrect storage calculation when SD card is inserted"
2022-07-16 02:35:19 +00:00
Grace Cheng
fd63a0aef0
Add missing description to SUW set pattern lock UI
...
Updates Setup Wizard set pattern lock UI to include a description
Fixes: 233666752
Test: Observe description on "Set pattern lock" setup wizard UI
Change-Id: I5199eca42ac17886fa200d5abdd41e61f4030950
2022-07-15 22:16:43 +00:00
TreeHugger Robot
ac6af411ed
Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp
2022-07-15 21:40:43 +00:00
Sorin Basca
61e0bcd194
Use Mockito 4.6.1 API
...
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit c1c3a84fdc
2022-07-15 20:05:37 +00:00
TreeHugger Robot
cafb63129c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: de8d037d68 -s ours am: 68d4addfdc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I0ca19eb0e480a18b028c97c095156d8516cbc2b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:53:32 +00:00
Bill Yi
1bcf2cea28
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 7cb9020b74 -s ours am: 42ae81fed7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I03b32df00588839b622c85e2416f8a6acf8f6fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:53:17 +00:00
Bill Yi
7a4991ecf0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: aae3370ac8 -s ours am: c5aff8f391 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: If7b3fee97f7473db545b6d67e86fc29e7df7e69c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:53:04 +00:00
TreeHugger Robot
9192425035
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours am: 086f4d675b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I128a267e658d79aa6a58fa4d3e9f5342759a91d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:50:08 +00:00
Bill Yi
fb3fd8e9de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours am: b70a1941ed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I5128d8c91bc9d9e9e5056494361181cec9d77ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:49:53 +00:00
Bill Yi
8ca886ff9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours am: 64ff179b42 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I61a77120a73e892d661c405bc6b391a1a6d96a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:49:39 +00:00
TreeHugger Robot
a687b7be39
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 188a2c66c1 -s ours am: 037a382168 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: Ie253fe1209c17087f2a2a2dbfd613ad828aaf0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:45:58 +00:00
Bill Yi
36ff4395d4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: cdd61bac15 -s ours am: 3df6f3fe63 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: Ice2c2819645683a7b94a1ddd09ebe99d3466f6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:45:41 +00:00
Bill Yi
5fd6295eb7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: 3050a6cb87 -s ours am: c25ff8ff49 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: Ia19913ae1ea28d450e2bba35ac26e2a0be62d2b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:45:23 +00:00
TreeHugger Robot
e57d5e757a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6 -s ours am: 0adac53973 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: I821924209a05a7c1dba102c875dcc1d58b399079
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:44:18 +00:00
Bill Yi
2313c8a358
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504 -s ours am: 392e976d77 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: Ice12a50b2d4249595f4f8dcb0c3953dff8093708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:44:02 +00:00
Bill Yi
2ebef8d20b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff486543a -s ours am: 4011a37faa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294494
Change-Id: I0458553b66af710508e18bfb98af080dd3a7c106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:43:48 +00:00
Automerger Merge Worker
73c7e602f6
Merge changes from topic "am-04754628637348948b04fab6958e617d" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233f20ec298208a300a43dfd0695e781f415f1b87066aa3b0a3a9617be8295cd8f919c2393f841a2af4cb2cb2e72ad1f25e52176ec6ae294e
2022-07-15 18:41:42 +00:00
TreeHugger Robot
68d4addfdc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: de8d037d68 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I73ae0e9bd563f434af2da30609389bfb33c14f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:41:15 +00:00
Bill Yi
42ae81fed7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 7cb9020b74 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: Ice0b1b94f294f49770062d4ddf56b2168ee1063c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:40:59 +00:00
Bill Yi
c5aff8f391
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: aae3370ac8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I2cd5e38945402505392ee45aad6190a5ae66ff1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:40:48 +00:00
TreeHugger Robot
5ef8d799fc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours am: d0695e781f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I15020d1d61cdbe3c5700a1703840f51a0378aa08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:40:40 +00:00
TreeHugger Robot
fc3718b3d8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 3ff66be05a -s ours am: ec4f2a953b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: If582167d9ab24594a588e5fa6991329a273cfc48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:40:38 +00:00
Bill Yi
f1796a67b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours am: d8f919c239 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I334aa0e27cf395cf5982e209a1d4dd33ddabc3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:40:24 +00:00
Bill Yi
1a29a382e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: 84ce084f90 -s ours am: 6f2aa0d0f7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I1caa4b5d67d728fb9477a3aaa500746de59fe8fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:40:20 +00:00
Bill Yi
e08f566a87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours am: 6ec6ae294e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I4c8460ed54f752fc8967f2ac188261c2c8c10c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:40:12 +00:00
Bill Yi
505057189b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: bc5abed2bd -s ours am: ea80c38015 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I79e0aacf6950d4a18e529e447f678e5e1f7dd23b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:40:03 +00:00
TreeHugger Robot
d0695e781f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I757e5ee6c17971a4062188180abe60e76f4509ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:32:56 +00:00
Bill Yi
d8f919c239
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I4ee1e7ab780dc181753b98182397dab315739314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:32:41 +00:00
Bill Yi
6ec6ae294e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: If18bd5eb780e6bbe76a695ef6de2de657955f4c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:32:29 +00:00
TreeHugger Robot
c54a6df09e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 188a2c66c1 -s ours am: 4479132675 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I4cdf25133ab27600135f3b3a3b5e15475ae419c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:14:36 +00:00
Bill Yi
850e3b1531
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: cdd61bac15 -s ours am: da2052f884 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I8ea786382119c28a9479ff6a7145ce0549842c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:14:19 +00:00
Bill Yi
e64f69f6cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: 3050a6cb87 -s ours am: 8ca2243678 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: Ifa4be9dbf2863454f8e9e643de42f8f954da5bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:14:03 +00:00
TreeHugger Robot
d39de8723d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6 -s ours am: fe9539f0a4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: I95d8cb7517106dba6bb71741ae682e053194dcd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:12:57 +00:00
Bill Yi
f5b244dab9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504 -s ours am: 9d6d73301d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: I81f66eea71f54d96f70c34ee93138e643fff7458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:12:43 +00:00
Bill Yi
a57a4a5d9f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff486543a -s ours am: b7eb3c0448 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294494
Change-Id: I89c54e6f76d63a1e89cd6d6c8ca9b778547aceeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:12:28 +00:00
TreeHugger Robot
086f4d675b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I33b20cdd9764615440073e42f50ac18155eae96f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:08:39 +00:00
Bill Yi
b70a1941ed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I6948c1dbb6a617b68d55d549e941e75730bce911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:08:22 +00:00
Bill Yi
64ff179b42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I707251703c788ba3f36c2c27f71e2b443ba83a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:08:09 +00:00
