PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,758 Commits 1 Branch 0 Tags
8552428dbc5ae4b0d52dc14c71a4b269cce8f93c
Commit Graph

115758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
8b6880320b Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 am: 6af2fb8578 am: b73bfeb0f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: I46ff04d8b76d0a7b3759763fcd11536c97499523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 05:06:58 +00:00
Bonian Chen
35cdf693c5 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 am: 6854fcd20d am: c00e4830a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: Ia3f0aa50134d2b3ded3f3b529f5bfd70e7be8759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 05:05:06 +00:00
Kedar Chitnis
c9c224e403 Merge "Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES" into tm-qpr-dev am: 82a33ac452 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19664054

Change-Id: Iddbb56c3ce2176ab6f9edbe3353ea2ccfef923e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 04:48:27 +00:00
Bonian Chen
b73bfeb0f1 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 am: 6af2fb8578 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: I018f61baae55f765476882e760263ff1718f8bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 04:46:08 +00:00
Bonian Chen
c00e4830a5 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 am: 6854fcd20d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: I3642f8b2c2f2e1dcc518b000fc44917c9eeaff8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 04:45:27 +00:00
Kedar Chitnis
82a33ac452 Merge "Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES" into tm-qpr-dev 2022-08-27 04:36:58 +00:00
Bonian Chen
6af2fb8578 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: If948deb5fc93c3654e474bd4d4d588859affbfa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 04:12:07 +00:00
Bonian Chen
6854fcd20d Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: I61ba7cfbc14f8972a0a8d74055893f5807c73a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-27 04:12:06 +00:00
Bonian Chen
45051bb169 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev 2022-08-27 03:58:07 +00:00
Automerger Merge Worker
38eef9c490 Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into tm-d1-dev-plus-aosp am: 34db7cdde9 am: bc39a69a57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: If4e0547f68e70cf145acd38eb5dd5aa2d56c0fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 19:24:49 +00:00
TreeHugger Robot
9a364eb6fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 29f4dd9a23 -s ours am: 5d6defbe4c -s ours am: 7ff9a55e98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91809503f29a99e0bf2c99cad6210f2d11c645d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 19:24:40 +00:00
Automerger Merge Worker
c5fdf6eb2b Merge changes from topic "am-52f1e073427d431498ea82df3bd4b4e1" into tm-qpr-dev-plus-aosp am: 08041f3779 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739241

Change-Id: Icf0aab717faca8b303ad8f064773fa4d3da4345b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 19:22:14 +00:00
Bill Yi
7b6cdb6b35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5a6b0cdb09 -s ours am: 8b2beac92a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8183ace37016c4ac8986f698f3e13f848665a9ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 19:21:59 +00:00
TreeHugger Robot
055dd415e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours am: be93a93ceb -s ours am: 7f7ffbcdac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9b26548b6cd27d3e9c0f53514969a26859e4286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 19:18:19 +00:00
Bill Yi
59d0bf1e5c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours am: 1620b3809f -s ours am: 82e339a78a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I228de650b2937be5d124f107e3d38d56e306eb37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 19:18:07 +00:00
Bill Yi
555aea87bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -s ours am: 40e838cb44 -s ours am: d026e6992d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib212e844013f3e14183c51695687ec5ad0baf0b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 19:17:57 +00:00
TreeHugger Robot
cc3a7a910c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours am: 9d4e8e6017 -s ours am: 1aef2326fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a3d2784bb80a650ec345cd42555fa682bf6e414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 19:15:52 +00:00
Bill Yi
c083c6694a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours am: 300674131a -s ours am: 3a5163c797 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I473b2787957c17a2c34ccc61d5bc64dccb6507f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 19:15:42 +00:00
Bill Yi
e5a2662e90 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -s ours am: b79c294840 -s ours am: 706c770114 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68300f9c65196acf873b8e64ae3c12fa2fccaba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 19:15:30 +00:00
Automerger Merge Worker
bc39a69a57 Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into tm-d1-dev-plus-aosp am: 34db7cdde9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: Ie70307ed4dc22e4f1b35be087d6fe902eb56db1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:57:14 +00:00
TreeHugger Robot
7ff9a55e98 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 29f4dd9a23 -s ours am: 5d6defbe4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie40049b23c5818cac1c780c75125840441424762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:57:01 +00:00
Automerger Merge Worker
08041f3779 Merge changes from topic "am-52f1e073427d431498ea82df3bd4b4e1" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5a6b0cdb09 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d1ddadb67 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 31c69075a7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 926be7fe01 -s ours
 2022-08-26 18:56:00 +00:00
Bill Yi
8b2beac92a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5a6b0cdb09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie42abed28dcd87f37bb044c967c441f76f7462e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:55:18 +00:00
Bill Yi
a770f4e6e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d1ddadb67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I173303b0814a66fc6b52ca8b71c90876b09b164d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:55:03 +00:00
Bill Yi
ad13dd05c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 31c69075a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75c8919a41fdf26639b2e5c5e5857e47ec93354c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:54:49 +00:00
Bill Yi
7281f2219a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 926be7fe01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f19523c38c302e3c6ce0abc905d722ba95753a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:54:35 +00:00
TreeHugger Robot
7f7ffbcdac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours am: be93a93ceb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib43327f9d29650e8712370a4dd7a2ea4b4eb1a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:54:31 +00:00
Bill Yi
82e339a78a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours am: 1620b3809f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a32e40e65125d4ecbe19ab9ffe360a6dc7b5181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:54:20 +00:00
Bill Yi
d026e6992d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -s ours am: 40e838cb44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c4c1d737e6d3e653c0ea517a3a155f591626750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:54:07 +00:00
TreeHugger Robot
1aef2326fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours am: 9d4e8e6017 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d31ee8ae6a3536ba4564c9052529cae7d82dd7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:50:43 +00:00
Bill Yi
3a5163c797 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours am: 300674131a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11e3525c995e2a74833546bf0161f317225e5a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:50:30 +00:00
Bill Yi
706c770114 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -s ours am: b79c294840 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9cc36aba5944ec09cd373d4b7f82f848daf589e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:50:19 +00:00
Bill Yi
7d5f1dc09a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-08-26 18:49:51 +00:00
Bill Yi
edabf34003 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-08-26 18:49:51 +00:00
Bill Yi
5a6b0cdb09 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-08-26 18:49:15 +00:00
Bill Yi
31c69075a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-08-26 18:49:15 +00:00
Oli Lan
f70e351d1a Prevent exfiltration of system files via avatar picker. 
This adds mitigations to prevent system files being exfiltrated
via the settings content provider when a content URI is provided
as a chosen user image.

The mitigations are:

1) Copy the image to a new URI rather than the existing takePictureUri
prior to cropping.

2) Only allow a system handler to respond to the CROP intent.

This is a fixed version of ag/17003629, to address b/239513606.

Bug: 187702830
Test: build and check functionality
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
Change-Id: I98eea867f926c508456ec9bc654e24eeeffa0e54
 2022-08-26 19:46:02 +01:00
YK Hung
571b54e7fa Merge "Support showing battery level chart first immediately after the battery level data is ready." 2022-08-26 18:39:25 +00:00
Automerger Merge Worker
34db7cdde9 Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 29f4dd9a23 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: aacbd2e2ae -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 089e0c7606 -s ours
 2022-08-26 18:33:31 +00:00
TreeHugger Robot
5d6defbe4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 29f4dd9a23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I927d21f0655638ca2fc42d0336e9db0283520ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:32:23 +00:00
Bill Yi
a99db9e352 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: aacbd2e2ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f14460622da4d3cb2a836f043cd872dd234eff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:32:10 +00:00
Bill Yi
e2c968545f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 089e0c7606 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4a34154bab2bac31d30af95ff10a1192137562e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:31:59 +00:00
TreeHugger Robot
be93a93ceb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I340e0338e9ab57fce5a22807eeaf075a451dece2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:31:15 +00:00
Bill Yi
1620b3809f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibea23be346fedd84bde90a3a78b60eb76c6eac01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:31:02 +00:00
Bill Yi
40e838cb44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc32ec7001b86babab1367eb6c802a5410e97796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:30:52 +00:00
TreeHugger Robot
8876e02d32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 45dfad65ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9951c057dd38669ccf7c098693489a125789a90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:30:43 +00:00
Bill Yi
f1a0c037eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 052b8aa9a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65742035ea6401fbe4d8948e45abd55c3d523630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:30:30 +00:00
Bill Yi
481c88ad00 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: ccc21cf723 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d384603560a8369a04dab26ce994502f81a3565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:30:20 +00:00
TreeHugger Robot
9d4e8e6017 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9804d8e73a7e90c179ff73bfadb004ae90959f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:29:36 +00:00
Bill Yi
300674131a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f26dd38c6860f52da1a026e23ce65fbac51842e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 18:29:24 +00:00