PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,925 Commits 1 Branch 0 Tags
a99db9e352ef033a56f54dd2f64349758094199a
Commit Graph

105925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bill Yi
aacbd2e2ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -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: I6d96dcd9e2da4c62d4a81aa2379dd52b6f03605e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:57:06 +00:00
Bill Yi
089e0c7606 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -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: I765f7749ff566563f7121463d3d3cad7790054aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:56:55 +00:00
Bill Yi
c9ac950159 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -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: I48e41e88032dfe727058fbce95de2efaf618757a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:46:49 +00:00
Bill Yi
bfd43e8459 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -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: Ie0bbb18017f81853c962c6cb34ee6eabaf9e619a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 17:46:35 +00:00
Bill Yi
4e5669b82f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie7ff28b6cf65231bab7757ae9c5c9bf1bee9f475
 2022-08-25 08:40:29 -07:00
Bill Yi
6ccb75281f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I222a6fa89b2ba5da975e473b52c7ebb70e5e607f
 2022-08-25 08:36:52 -07:00
Bill Yi
5c691c0670 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad5a8f14604bcba021c13146ec1b0b4fb2d11681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:23:20 +00:00
Bill Yi
60f828e428 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd342af76d5df98b8855635e5fdac9097dc66335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:22:55 +00:00
Bill Yi
9281ec1752 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ce860ad406c50b616e86eeb03d341dc422cff4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:22:35 +00:00
Bill Yi
381f37b918 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I832faea9d0f28e85e4ce5fc7c796bf0d94a093c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:22:18 +00:00
Treehugger Robot
1467de15bc Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb am: 4c06c2426d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: I6ffe3f49c01d692a9eb1c77030be732be204ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:17:42 +00:00
Treehugger Robot
4c06c2426d Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: If151337acb399e3ce8ab733eb44d2cc6a9ef0484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 13:59:51 +00:00
Bill Yi
1be27e97c5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-23 13:56:32 +00:00
Bill Yi
1a3d6c47c2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-23 13:56:32 +00:00
Treehugger Robot
280ad76afb Merge "Fix always return first package for mock location app in developer options." am: d221269892 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: I66bdf2036d3a3af348137b07a1b2b9edb29d1894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 13:38:27 +00:00
Treehugger Robot
d221269892 Merge "Fix always return first package for mock location app in developer options." 2022-08-23 13:15:51 +00:00
张倞诚
d8d0cb3532 Fix always return first package for mock location app in developer options. 
The mock location app should be OP_MOCK_LOCATION allowed app, the packageOps.get(0).getPackageName()
is the first app that used the OP_MOCK_LOCATION in history, but maybe rejected.

Change-Id: I0158436dd7d2790f4e9640075bc9c8bd3422f467
 2022-08-23 07:50:16 +00:00
Automerger Merge Worker
ad5444df28 Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: f8f3b752ea -s ours
 2022-08-23 06:52:09 +00:00
TreeHugger Robot
9313d8a22a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: aa3a5a8e5f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbc3f343aa07d0122481f2908c9b6d97aea4d30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:51:15 +00:00
TreeHugger Robot
a31f4bd4de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb4cb81dd2d8389d328d97cb4736888a8791b4c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:51:10 +00:00
Bill Yi
03694f9b15 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: c6fcf4dd69 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f306f069b9c31b824091a7aafc43ef84b348cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:50:57 +00:00
Bill Yi
43e0cb70ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: f8f3b752ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I891d1b51f44b3da0074262eeb5b7a92f7598fe3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:50:52 +00:00
TreeHugger Robot
4f819e1516 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa6359f18e9ab1bc55e1b98b25d634b893ff4cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:12:41 +00:00
Bill Yi
f8f3b752ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Iaeecd274c351d8e464dde1a2d47b97fe7dbc4768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:11:12 +00:00
Bill Yi
c6fcf4dd69 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If536c05600e8c63286f3ca35e5526b3dd0179e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:10:54 +00:00
TreeHugger Robot
ad78b5a675 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-23 05:47:36 +00:00
Oli Lan
5c46283548 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 80cdde7ce8 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Icb22ace85025a844aedfcc8f83a2f25aa88912af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:53:19 +00:00
Automerger Merge Worker
19f1f4fb14 Merge "[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours" into tm-d1-dev-plus-aosp 2022-08-22 16:53:13 +00:00
Oli Lan
d9da83fc20 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Iecd9189cd8e37f5f784dce3b0b12395a513ba3f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:53:10 +00:00
Oli Lan
4d00a7174b [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ie4280bc8c8c693709f838656e00b66c7b7b390e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:53:04 +00:00
Oli Lan
505e7f9b1b [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: 1dbf6b7d60 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ife850b6223e0b6abbbab9a2dd145a31e3e69023c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:52:55 +00:00
Oli Lan
80cdde7ce8 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ic216159568b50b5e42fd19f762fe16b83f3de50a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:34:53 +00:00
Oli Lan
da927d5a6b [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I81a86c60b0b2a352d6b326864a2e5a8eee53ca98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:34:43 +00:00
Oli Lan
5d23958f2a [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ia834ccb8fe8912400f49b891dc12666acd59bb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:33:31 +00:00
Oli Lan
bb562d7426 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I07b0906b78784d42784afcc982973e916517b479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:33:17 +00:00
Oli Lan
1dbf6b7d60 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Id581ae55b5a6ff4fc0d5c96b33ef58e8562215e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:33:17 +00:00
Oli Lan
40ec6382a0 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: I4db81a26ef2ede09401e576c6fc5afeb57d48291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:16:49 +00:00
Oli Lan
d3938dfc4c [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Iecf56bfac38ff2dbc603a9f96f4f57add7de3a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:16:47 +00:00
Oli Lan
819430ed60 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Iec95e74515918dd7a9c7c0598f88031ee58682d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:58:26 +00:00
Oli Lan
141dc63796 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

Change-Id: Ic969ff87d67009c3737c74f950966f19772f3269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:57:47 +00:00
Oli Lan
48046cf4ae [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I8dbc2b22a606856e839bcdbdc368c139df7d0b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:39:22 +00:00
Oli Lan
e2815b7e11 Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016

Change-Id: I017c55ae2e7770bd52f1daca54e2aed7be05cb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:21:18 +00:00
Oli Lan
03b1a52977 Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016

Change-Id: I5a78c2328f8c68fb5bf15799a69479a82b8e7af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:03:51 +00:00
Oli Lan
05031cc574 Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016

Change-Id: Icfcf27040f9402b736306cf19178feee9f2a774b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 14:46:20 +00:00
Oli Lan
b9bafa0d3d Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev 2022-08-22 14:27:57 +00:00
Bill Yi
9c441ad4fe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia5f187a561427f4822814e50b6a490df46dc432d
 2022-08-22 02:33:14 -07:00
Bill Yi
789b774cb2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I39edf1cef0326d044fa50b652adbddb6a7a2a437
 2022-08-22 02:21:31 -07:00