TreeHugger Robot
c45731efdb
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev
2022-06-14 03:01:18 +00:00
Jason Chiu
27c6b55ac5
Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link
...
If an app starts a Settings deep link with FLAG_ACTIVITY_NEW_DOCUMENT,
FLAG_ACIVITY_NEW_TASK is auto-appended by frameworks which causes a
SecurityException on the 2-pane design because starting a new task on
the right pane is not allowed.
Deep links in the 2-pane design will clear the top activities, which has
the same UX behavior of setting FLAG_ACTIVITY_NEW_DOCUMENT, so we remove
the flag in this case.
Fix: 233917580
Test: start account page via Assistant
Change-Id: Idcbeb96e441592d48686f18f3433864f2c14832a
2022-06-14 02:45:49 +00:00
Bill Yi
f84049c4e7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iae080c4ad83f0090a8a4a6bcd2b2438564c563ec
2022-06-13 17:00:54 -07:00
Bill Yi
f68acfb73e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I18a9ac4db3be35e4b643a213c8635b1b22a2bec8
2022-06-13 16:26:38 -07:00
Gil Cukierman
5050df400d
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165 am: fecd7c1c1a am: ad8685a28e am: f5c8089089
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I651849d152783f5df70f15f1c473c2ddceab8815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 21:23:10 +00:00
Gil Cukierman
f5c8089089
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165 am: fecd7c1c1a am: ad8685a28e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I7a16c8e1c2a6e397cc14fe92a8d7cd02708d24ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 20:43:42 +00:00
Gil Cukierman
ad8685a28e
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165 am: fecd7c1c1a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I52b1fba91b6d25b5b02d94d9ae3fd9cf307cb37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 20:16:03 +00:00
Gil Cukierman
fecd7c1c1a
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I6ceccc283e4065fb94b2cf0c741905be40b31c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 19:48:40 +00:00
TreeHugger Robot
23d474a36f
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57 am: 4f31518c41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: I1aa20e2860d1c2cc0952c820516b649b74074315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 19:48:20 +00:00
TreeHugger Robot
be7c57781a
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: 62a0ea69e3 am: 751fb13dea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: I0f8811fc7cba6bc0636ff01f6de83b30780d25ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 19:47:29 +00:00
TreeHugger Robot
4bdd4359dc
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57 am: 9d882fbb81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: I0ac35362b2d5619ade43a004e948da8b84a0a957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 19:47:25 +00:00
Gil Cukierman
778d851165
Merge "Improve documentation of Enable2gPreferenceController"
2022-06-13 19:03:49 +00:00
TreeHugger Robot
9d882fbb81
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: Id5aca9149c81f6c29164f832e438c210494ee58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:58:44 +00:00
TreeHugger Robot
4f31518c41
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: Iaf4096983d2b3cfb6e56cf336537be5b3f38fa1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:58:36 +00:00
TreeHugger Robot
751fb13dea
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: 62a0ea69e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: Ie4a6f197d16da945da70d76f0612c59306f1ad5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:49:38 +00:00
TreeHugger Robot
a0ebaf2b57
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: I499228ea7bc6dd7971447040dac399dea5cb45d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:31:22 +00:00
TreeHugger Robot
fb368c1ade
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 3ecbe9bc0b -s ours am: 0602432a32 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I2f4676ac1399d9e0fe5f97df580482c2d243e52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:31:13 +00:00
Bill Yi
9a9e114866
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: ae5b4b8105 -s ours am: b8112dac09 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: Idb52a99e6ffbeb42db04a645694e7a3ba65c7538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:30:57 +00:00
Bill Yi
f2ee2e6a04
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: b0b7c615bf -s ours am: 30580dfed4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: I5cae0dcca354acc7693326b31f05b28f0d5d73f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:30:43 +00:00
TreeHugger Robot
62a0ea69e3
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: I5a82edaa021f62b910267ff6f7da5fda43453031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:29:37 +00:00
TreeHugger Robot
e058aae3cd
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev
2022-06-13 18:11:22 +00:00
TreeHugger Robot
0602432a32
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 3ecbe9bc0b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I62f62d45d9c9b6a4fe74ec9c10060c16a0304984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:03:33 +00:00
Bill Yi
b8112dac09
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: ae5b4b8105 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: Ie189203047c5d3106f06b155330a8ec3a6e2046f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:03:21 +00:00
Bill Yi
30580dfed4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: b0b7c615bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: I26a6412f180f6ee94e1f48e3b79459bba6c91af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:03:01 +00:00
TreeHugger Robot
0cd6c648b7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours am: d956cbe32a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: Ibc66aeac415edf1b8d19ba40d831d02196755552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:50:27 +00:00
Bill Yi
10c38cbe0e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 85d2a6c7b4 -s ours am: 947e4e0ce8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I1817974e381f1097f0a0846d21f798df59103e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:50:15 +00:00
Bill Yi
bd9fab0861
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours am: 14f91f0604 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: I8760a71f05782575d7dcc38148dc78246448dc99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:49:55 +00:00
Automerger Merge Worker
ba19ff3ead
Merge changes from topic "am-8706eed2db7742ddaa28a0099287ea89" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ace5a507e23c7723c3723445f454ec8f154b913f4b04d01b266185d2a6c7b46693d73ef5f5cfec7f75362f3f6b6ad9fbc3319cb8aa62dbea
2022-06-13 17:48:03 +00:00
TreeHugger Robot
0eefdd24ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours am: 45f454ec8f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I17991c4a06519ccb0a19ff4de32873d5d21c25b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:46:58 +00:00
Bill Yi
af52e9c611
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 85d2a6c7b4 -s ours am: 6693d73ef5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I554b6364f4d253a62e6224a83342bcda7d2cc017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:46:42 +00:00
Bill Yi
972a4326da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours am: c921642dde -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: Ia032ac2cc8405bc37b1e976b9da41369ce206f23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:46:35 +00:00
Bill Yi
f0129ada03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours am: b8aa62dbea -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: Iff6952fcb7dab61d3eab327b3ac19ad8a305efc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:46:27 +00:00
Automerger Merge Worker
3227a73df6
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours" into tm-d1-dev-plus-aosp am: a20f785e3d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858730
Change-Id: Id92b0d3ff35196b4c95d357387efe794ca1c52ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:45:03 +00:00
Bill Yi
db742301ac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours am: 798cf379cc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858730
Change-Id: Id3dea9fd2d0d905f58f7f03837edfc8711848bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:44:30 +00:00
Automerger Merge Worker
5a8d9eacb1
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours am: eb43205dbf -s ours" into tm-qpr-dev-plus-aosp
2022-06-13 17:43:32 +00:00
Bill Yi
8775a1bde6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: fbf554e66e -s ours am: 46f045f411 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I7e580674d228696aabcecd2bc2a5b75993ef80bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:42:20 +00:00
Bill Yi
022a077d4e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours am: eb43205dbf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I13e1e8390eca6731f4f98cd9975b20ea8e74e465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:42:06 +00:00
TreeHugger Robot
3ecbe9bc0b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: Ib80b1d4f968a8275bc8c92aede6c84f8aa7ab523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:32:34 +00:00
Bill Yi
ae5b4b8105
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: Ibe20bf626167e701d69bb9b57eb6fa1a42fb1270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:32:19 +00:00
Bill Yi
b0b7c615bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: Ibfd46c1623530d3384f10c41bd4a19f4817a75e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:32:04 +00:00
Bill Yi
e42d87f108
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours am: 9af911315b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858730
Change-Id: Ic07c8577b39334f06604902ef7fcb69b176463b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:23:12 +00:00
Weng Su
a8ccc3456c
Restrict guest user to configure WiFi by QR code
...
- Don't show WifiDppConfiguratorActivity if the user is a guest.
Bug: 224772890
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppConfiguratorActivityTest
Change-Id: I160761edfe2893475676421ba2b59205da8d0224
2022-06-14 01:20:54 +08:00
TreeHugger Robot
45f454ec8f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I28084562f39320be146fd8332b633aa375f43344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:41 +00:00
TreeHugger Robot
d956cbe32a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I5d6f2d6b1b3e99fb080c438a0cb5c83be1c4a47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:33 +00:00
Bill Yi
6693d73ef5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 85d2a6c7b4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I7e2beaed53830562a4196d947b62afc5e2782804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:25 +00:00
Bill Yi
947e4e0ce8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 85d2a6c7b4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I5bd6f198943162cd76025f9d80e9fbb6f7699b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:17 +00:00
Bill Yi
b8aa62dbea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: I013c6fb27657600426b7303ce20b460914bc65b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:09 +00:00
Bill Yi
14f91f0604
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: I09519681ced6997db295739bb967083ce56d44cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:02 +00:00
Bill Yi
eb43205dbf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I6d0d1106993015ada09e1f17d6eb90039ece8b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:18:09 +00:00
Bill Yi
c921642dde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I3141c81605ef7a72c49e33e64fdea27858a171bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:17:23 +00:00
