Commit Graph

113831 Commits

Author SHA1 Message Date
TreeHugger Robot
a57a7f0254 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db -s ours am: 8c14b68114 -s ours am: 1e280a87bd -s ours am: 7f57f245ea -s ours am: e5e1052716 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79fd75a7068c4cecb7b3919561f08546de0247bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 07:32:47 +00:00
TreeHugger Robot
41bef7c889 Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d am: d326b911be am: 5410535cba am: 6189cc318d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967

Change-Id: Ie1fd7505af497eda62cac22b36dfbd515343df70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 07:26:35 +00:00
Bill Yi
b0bf84f358 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 am: b53a13a2e0 -s ours am: 6233a4ce39 -s ours am: e4567ac6fa -s ours am: b10a2fd701 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d237b52a0efbd513f54354ce17f3c48b0c35f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 07:26:32 +00:00
Bill Yi
285acd149d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 am: 09659e52e5 -s ours am: c0cca64b22 -s ours am: 4c528042e6 -s ours am: 4848c77a19 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib979df53a5884f3996faafa76629c87656b5d386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 07:26:23 +00:00
TreeHugger Robot
76a9962c0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8089ee68b7 -s ours am: ce769c9f5b -s ours am: e4df1dc20b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife18f6ddabee7cc3501f3ca54afd57b071410fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 07:22:50 +00:00
Bill Yi
437b05bdeb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7aee397d84 -s ours am: f7cfe7d1bb -s ours am: 2f1298d571 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I691aebd328681f30d0edc05e1d38312c69bf2726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 07:22:37 +00:00
Bill Yi
94be267e69 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c764b4ac4f -s ours am: e356dab2fb -s ours am: 4a8a7a520f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0e7de9a434b1c967adce3e47d3ab7a11e2452d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 07:22:20 +00:00
TreeHugger Robot
e5e1052716 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db -s ours am: 8c14b68114 -s ours am: 1e280a87bd -s ours am: 7f57f245ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f566dce54e8c56ba529cf2c9d70edf998bb0467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 07:00:09 +00:00
TreeHugger Robot
6189cc318d Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d am: d326b911be am: 5410535cba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967

Change-Id: I0c4b770cead0db740918ce770bc459075f2276e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:59:21 +00:00
Bill Yi
b10a2fd701 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 am: b53a13a2e0 -s ours am: 6233a4ce39 -s ours am: e4567ac6fa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46fe2e820b341f75690a0fd720ea01132dea2446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:59:17 +00:00
Bill Yi
4848c77a19 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 am: 09659e52e5 -s ours am: c0cca64b22 -s ours am: 4c528042e6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22a2f74bb793cbe9613808df29e63b282aa3c808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:59:10 +00:00
TreeHugger Robot
a7e60aaf7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db -s ours am: 8c14b68114 -s ours am: 357de9f453 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I430f8c93907d4b0aaab74dd38efc1c40e1535a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:58:45 +00:00
TreeHugger Robot
d2cfa10f0b Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d am: 6897e89ae3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967

Change-Id: I64e98bdb225e5314374f2ff890e3d915fd6dc417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:57:36 +00:00
Bill Yi
543b1e1deb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 am: b53a13a2e0 -s ours am: 0454963189 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5fea7593ad977337cd809f40907ddcf40a459088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:57:32 +00:00
TreeHugger Robot
e4df1dc20b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8089ee68b7 -s ours am: ce769c9f5b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48429838649dbb93c4757d93bc20455dc23c7737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:57:30 +00:00
Bill Yi
99396168ef [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 am: 09659e52e5 -s ours am: 4a3e4af52b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9574defd4c9d21af4c95676262a082c6563303e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:57:24 +00:00
Bill Yi
2f1298d571 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7aee397d84 -s ours am: f7cfe7d1bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5867903d68ffb2d9dd3f4205aaea18c35cff8092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:57:18 +00:00
Bill Yi
4a8a7a520f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c764b4ac4f -s ours am: e356dab2fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I59da858f2c2df484188d515eda5635bdefc73844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:56:59 +00:00
Chaohui Wang
0441f990f9 Merge "Remove the redundant constructor of SuggestionFeatureProviderImpl" 2022-08-08 06:47:18 +00:00
TreeHugger Robot
357de9f453 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db -s ours am: 8c14b68114 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff759e9552ac79ae86002123af16168a53e2aeb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:40:32 +00:00
TreeHugger Robot
7f57f245ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db -s ours am: 8c14b68114 -s ours am: 1e280a87bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55a3ee2f74ae90a9bc5a6cca29f75d737c8eebf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:37:59 +00:00
TreeHugger Robot
5410535cba Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d am: d326b911be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967

Change-Id: I51c7f73a69906386624f1f997b4000e77bfb7bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:37:29 +00:00
Bill Yi
e4567ac6fa [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 am: b53a13a2e0 -s ours am: 6233a4ce39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia26a75b1b6455310f21e132335572d105e380bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:37:23 +00:00
Bill Yi
4c528042e6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 am: 09659e52e5 -s ours am: c0cca64b22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbb5c8070e2d8a254eaf499cc783a3a7a3b0da65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:37:17 +00:00
TreeHugger Robot
ce769c9f5b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8089ee68b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id80f9644a8e6e3d39f16a39c54e7418ec89f9e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:35:30 +00:00
Bill Yi
f7cfe7d1bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7aee397d84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifad93564c07d2c91b00d55d896f333045bf4641b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:35:15 +00:00
Bill Yi
e356dab2fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c764b4ac4f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8b6c5ff8843ebf4345a1d612b57669306984504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:35:00 +00:00
TreeHugger Robot
1e280a87bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db -s ours am: 8c14b68114 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee81d0765b71b14733860263ef994286336d1206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:32:39 +00:00
TreeHugger Robot
d326b911be Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967

Change-Id: I1e2129d71f907e0a73d3b689f3b94601bc9595a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:32:18 +00:00
Bill Yi
6233a4ce39 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 am: b53a13a2e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e30fd8f5c17c1b0c75a769eae3c5ea9362e7204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:32:13 +00:00
Bill Yi
c0cca64b22 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 am: 09659e52e5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9dfb004a6254f78c5c9ab6a4f718deac1cc21023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:32:06 +00:00
TreeHugger Robot
8c14b68114 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4cb5761fe5ccb02d3ff3a18a0506ec53a2f911c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:31:56 +00:00
TreeHugger Robot
6897e89ae3 Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967

Change-Id: I1b7f5ca489c3e9dfeeab7ce1f2fab8298e8903e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:31:14 +00:00
Bill Yi
0454963189 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 am: b53a13a2e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If828bf934921d6b90131b67429447d33cf835d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:31:10 +00:00
Bill Yi
4a3e4af52b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 am: 09659e52e5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia593045d0cad75dc5d9374305b9ba44f5970e21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 06:31:02 +00:00
TreeHugger Robot
4b5e98636d Merge changes from topic "tc_change_22080720_11" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
  Import translations. DO NOT MERGE ANYWHERE
2022-08-08 06:15:46 +00:00
TreeHugger Robot
074ee502db Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-08 06:15:46 +00:00
TreeHugger Robot
8089ee68b7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-08 06:14:23 +00:00
Bill Yi
b53a13a2e0 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
Blank merge reason: commit message contains skip directive

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

Change-Id: I81b0193030cd411cfb96bac41035f1108eb8d711
2022-08-08 03:46:23 +00:00
Bill Yi
09659e52e5 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
Blank merge reason: commit message contains skip directive

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

Change-Id: I60ece2eb12a9bffe10f577c34e98eb2e3dab95ce
2022-08-08 03:46:19 +00:00
Kuan Wang
373390f660 Update usage data for EBS app usage list and App usage detail from 24
hours to last full charge.

Bug: 236101687
Test: manual + make RunSettingsRoboTests
Change-Id: I48097dcaaf7b4100fbd7802940aac7c5ef92ee0b
2022-08-08 03:29:12 +00:00
Bill Yi
f018579680 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic331399e2cd77e79241be5f8c894564ce5013f34
2022-08-07 16:19:51 -07:00
Bill Yi
28e5ac6564 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I547cb6a91451ece2aff22ceadc9c156cf043582c
2022-08-07 16:16:19 -07:00
Bill Yi
7aee397d84 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2bee4360c5ce826ccbebfea10137b32c2598bb8a
2022-08-07 00:10:06 -07:00
Bill Yi
c764b4ac4f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If4fff28727c9bc27e16288c71ca3a8cb85f85e1b
2022-08-06 23:56:46 -07:00
Bill Yi
66479d6de4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0 -s ours am: 19ea488dcc -s ours am: 58ee9e7782 -s ours am: dc05292ad9 -s ours am: 6adfef40e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id868b6d44f5e32c0d60482ef49bd84980751328f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-07 06:38:29 +00:00
Bill Yi
6adfef40e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0 -s ours am: 19ea488dcc -s ours am: 58ee9e7782 -s ours am: dc05292ad9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07efad6dd904510cee4bed647cc6ad2fb103c9ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-07 06:20:04 +00:00
Bill Yi
4e4782d09d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0 -s ours am: 19ea488dcc -s ours am: 854e4b5ebc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I45353c1ac21516d87ea9b3362f11bea52056245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-07 06:09:59 +00:00
Bill Yi
be7f4620b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0 -s ours am: 19ea488dcc -s ours am: 541b8bc18e -s ours am: 30ced1fe68 -s ours am: 5b7f5c447a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iabcc46797a574548c42fd0841d8e57b56256a9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-07 05:56:41 +00:00
Automerger Merge Worker
7cbf42158c Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0 -s ours am: 19ea488dcc -s ours am: 541b8bc18e -s ours am: ff8249a4cd -s ours" into tm-qpr-dev-plus-aosp am: 5648d42231 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If158a99c7ed551bb3fe14f4e110ab85ccbb7a33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-07 05:54:51 +00:00