Commit Graph

93815 Commits

Author SHA1 Message Date
Tsung-Mao Fang
18ad0c49a8 Import the window extension libary in the Settings app
Test: Rebuilt apk and run apk successfully.
Bug: 196939216
Change-Id: If9040ae9a1c72097e4964c8d40ea9785cf2f01dc
2021-08-19 17:23:11 +08:00
TreeHugger Robot
b7680ac22a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: ebdc111881 -s ours am: a395f188e1 -s ours am: c27be2ae19 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib350f5e2c470d1745cc6ca3aea90e56113d6bd98
2021-08-18 01:43:29 +00:00
TreeHugger Robot
0a314e4ce0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: ebdc111881 -s ours am: 87231f645a -s ours am: 4910632334 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id7660351ee19aa7118be81272f15e29f6f721e96
2021-08-18 01:42:35 +00:00
TreeHugger Robot
fbee52192e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: c3d27dad60 -s ours am: f30d081a94 -s ours am: 95d74f01f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I599fd30b8a054ee33340186ee9cdf9f5f4a7789f
2021-08-18 01:41:28 +00:00
Bill Yi
94d6ca6d72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: 2aa1ba2fba -s ours am: dda7bf46cf -s ours am: 2b29686be9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I38c290797387f32d1bbb0f1e91c7648628218ada
2021-08-18 01:40:30 +00:00
Bill Yi
2ca2c8668d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 88e247bfe9 -s ours am: fa45968616 -s ours am: 8e9f6de18c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I628490c5c4cfb828b99d30a92fa0062e9565c604
2021-08-18 01:39:59 +00:00
Bill Yi
6506c456b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: 2aa1ba2fba -s ours am: 634884e7ba -s ours am: 1a11a32a56 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia030f32954b8c0d24b3f6a749513850c0243c995
2021-08-18 01:39:13 +00:00
Bill Yi
227448ae2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 88e247bfe9 -s ours am: 28c5c2fdb6 -s ours am: a618b7d2a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I603331ec100ee06ba4644135ceaa5f8dec30f8d6
2021-08-18 01:38:28 +00:00
Bill Yi
026e1df278 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: f3da5afffa -s ours am: db14bcbe3b -s ours am: cd7094b9a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67cb574b2c6cc90574386eabf0ea54ac3600b202
2021-08-18 01:37:22 +00:00
Bill Yi
0a0ac24557 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 63f455688c -s ours am: 1492ac1bfd -s ours am: 1804f4e0af -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a10dc4bb6c6fbd7aceb2793f002636df07185e6
2021-08-18 01:36:54 +00:00
Bill Yi
d4467ece43 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-dev-plus-aosp am: 6b6e3e88b9 am: aeb3f24e59 am: 08d2af9e10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: I0a5b4f86a556982f78b8c3639989203a4fd5cc70
2021-08-18 01:35:43 +00:00
Bill Yi
2f6fec9abb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb am: 635d7a2949 -s ours am: 743457a225 -s ours am: d12cbd225b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic02b48eef8970c03d3637abe49aa8c1d11a7aae6
2021-08-18 01:35:40 +00:00
Bill Yi
d1b2aedb53 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-dev-plus-aosp am: 4d1a339b98 am: 1abe5e1740 am: 1da245f5af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: Ie0c9affad374a02c47e02a07384243424d4ac821
2021-08-18 01:34:16 +00:00
Bill Yi
95b6f76082 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb am: cd0d73535b -s ours am: dabdae9adb -s ours am: 1d630b2e6e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5b58d546425070fdf24327b2a0635809ddaa2184
2021-08-18 01:34:14 +00:00
TreeHugger Robot
abcdb9b66f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 345eec506d -s ours am: dc69206b6e -s ours am: cb38d31a13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If144a01bbda00baaddd6ed6862a2e8166eeb8b2f
2021-08-18 01:29:48 +00:00
Bill Yi
a9ced00b13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: f8f7afe889 -s ours am: 79e8d066ef -s ours am: 06955416e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d5aad2f3573189c39dbf8b0c02c75690553a423
2021-08-18 01:28:32 +00:00
Bill Yi
c1bab4a77b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 1ca3b46718 -s ours am: 11895d923a -s ours am: b0173be441 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92d0a7133750d53d80ec47a739aad5358ed05176
2021-08-18 01:26:44 +00:00
Jordan Jozwiak
84fff1384d Merge "Use refactored RecentAppOpsAccess" into sc-v2-dev am: 5da0ca8a14 am: 8df6b505af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15547175

Change-Id: I9453a12a4bfe6e79e3a19a7371bba7ab03215a39
2021-08-18 01:12:01 +00:00
TreeHugger Robot
5e51e123dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours am: 6ac0521fc9 -s ours am: 3365e403a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98eb37cde2cded2a2a9feaed2017b5e9290ff8a2
2021-08-18 00:36:41 +00:00
Bill Yi
abd43900df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours am: 0ffadc1caf -s ours am: 7b49f388eb -s ours
am skip reason: subject contains skip directive

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

Change-Id: If391f264b0fe71c21ef43c394f36023b6c2def98
2021-08-18 00:36:35 +00:00
TreeHugger Robot
24911ae517 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours am: 99036fe183 -s ours am: c16965f2a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25c490d34f61dcbbbaf3f076cee47f809a8f286b
2021-08-18 00:36:30 +00:00
Bill Yi
7fa35a5808 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours am: 9f379245bb -s ours am: 528d97bbee -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iefd1ea9870a83cad04af97d6ba7a6e3462bd816b
2021-08-18 00:36:23 +00:00
Bill Yi
b9d4c914cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -s ours am: 48bd94aad3 -s ours am: c8aa2fc52f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibaa1d36ade6414aae7fdf02666e60847dc1f8d85
2021-08-18 00:36:17 +00:00
Bill Yi
5dd1ed611f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -s ours am: baf3a8b3bd -s ours am: 7c14455c8b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib4897841fe30027c86d7c599ca2a5220356e16fb
2021-08-18 00:36:11 +00:00
TreeHugger Robot
8266bf76fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours am: ed4f4693c2 -s ours am: fe24c2c1ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib218221dee4e3097e951223ef19e19171dcf5bbc
2021-08-18 00:36:05 +00:00
TreeHugger Robot
ac33be89e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours am: d9754e6900 -s ours am: 150a09b784 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaaff37379b6130b117ec0013fe5a0bf13d1e1ddf
2021-08-18 00:35:59 +00:00
Xin Li
c5369df06b [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours am: c1853be4d0 -s ours am: 0313c67921 -s ours am: 7238a80218 -s ours
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

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

Change-Id: I63cf2a94bfa62f5a648bf3d77ce50694ebeb530d
2021-08-18 00:23:57 +00:00
TreeHugger Robot
c27be2ae19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: ebdc111881 -s ours am: a395f188e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied5a4636e2d76cae82c28aa7665704677c50c682
2021-08-18 00:21:13 +00:00
TreeHugger Robot
4910632334 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: ebdc111881 -s ours am: 87231f645a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b39b07cd852ec1507c9f0910bc15116537eecf8
2021-08-18 00:13:19 +00:00
TreeHugger Robot
95d74f01f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: c3d27dad60 -s ours am: f30d081a94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0248828382944e954ce8324fcf55538d1f6c95fa
2021-08-18 00:13:00 +00:00
TreeHugger Robot
87231f645a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: ebdc111881 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22c1fc7d7c0c7b0b0750a2431d6851b8cb917290
2021-08-18 00:02:02 +00:00
TreeHugger Robot
a395f188e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: ebdc111881 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia4aaed3b31e0c1b618df506beff15d7bf1c4f37b
2021-08-18 00:01:39 +00:00
TreeHugger Robot
f6f69585c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: 171722b764 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I01be210d351794a18cef95286bb4e124541eae36
2021-08-18 00:00:09 +00:00
TreeHugger Robot
f30d081a94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: c3d27dad60 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb21bb093047d9628bce7f6c911750b4d5fab8a5
2021-08-17 23:56:06 +00:00
TreeHugger Robot
ebdc111881 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46a0db7c5e375574da88ac20db52790c3ccf29ea
2021-08-17 23:43:42 +00:00
TreeHugger Robot
171722b764 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I669169439a94eb1a0d287ca24e48a23e66dec2f4
2021-08-17 23:42:15 +00:00
TreeHugger Robot
c3d27dad60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I01a092f96b4633ff98b538c88e77d00a26484b98
2021-08-17 23:40:25 +00:00
TreeHugger Robot
cee3e9bfce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c0963f016e83b020dcffc91517604cfd0197468
2021-08-17 23:27:43 +00:00
TreeHugger Robot
a26ca75570 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-17 23:08:15 +00:00
Bill Yi
2b29686be9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: 2aa1ba2fba -s ours am: dda7bf46cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d3f4dad0b2c407f447d8385733102217b8a80ef
2021-08-17 22:53:44 +00:00
Bill Yi
8e9f6de18c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 88e247bfe9 -s ours am: fa45968616 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6853aa771f6a39ae52d8c577d5e58ea82d0a6b2
2021-08-17 22:53:16 +00:00
Bill Yi
1a11a32a56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: 2aa1ba2fba -s ours am: 634884e7ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0e997ded32be1f5c5de95658ebaee15b3ab3c50
2021-08-17 22:48:17 +00:00
Bill Yi
a618b7d2a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 88e247bfe9 -s ours am: 28c5c2fdb6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icf48f6b42db52108acfe133fc3f84b3fb65ea648
2021-08-17 22:48:11 +00:00
Bill Yi
cd7094b9a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: f3da5afffa -s ours am: db14bcbe3b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6fdb9fd2aa421a99cdf333d7ee96cc2589ff7d3
2021-08-17 22:47:54 +00:00
Bill Yi
1804f4e0af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 63f455688c -s ours am: 1492ac1bfd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2adec905266a51717027bffcdb3eadd01e138e9c
2021-08-17 22:47:25 +00:00
Bill Yi
08d2af9e10 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-dev-plus-aosp am: 6b6e3e88b9 am: aeb3f24e59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: I8c09f6f8a1cc535e49fdabbeb843e6483517c8b7
2021-08-17 22:47:02 +00:00
Bill Yi
d12cbd225b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb am: 635d7a2949 -s ours am: 743457a225 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b5d71b5fc06d7d70c45121149c35b770813917e
2021-08-17 22:47:00 +00:00
Bill Yi
1da245f5af Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-dev-plus-aosp am: 4d1a339b98 am: 1abe5e1740
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: Idb9a9e8e2aa5bd76c221a8dff9b7eb029e642a2d
2021-08-17 22:45:17 +00:00
Bill Yi
1d630b2e6e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb am: cd0d73535b -s ours am: dabdae9adb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I739744a35dd45f3b422323fe46355f6fd6b62f7d
2021-08-17 22:45:15 +00:00
TreeHugger Robot
cb38d31a13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 345eec506d -s ours am: dc69206b6e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I522d2068fcb1c7b452cbe03227ae87807e24ee37
2021-08-17 22:38:40 +00:00