PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,893 Commits 1 Branch 0 Tags
b55ee3e40cd48911af4d70728b34bc34bf5caacb
Commit Graph

108893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
b55ee3e40c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours am: 0bc186ced0 -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: I0fa6be28773a7a887007d81402bb8e456a3ac919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:41:05 +00:00
TreeHugger Robot
f4a4722c33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours am: bf23a06eac -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: I66be52d039371640b6bcbf4df1fe8c3ab8b5dffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:27:13 +00:00
Bill Yi
2c63bb5b09 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: f8f3b752ea -s ours am: 637265f9ea -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: I152fc992e09d34a12b52f4b09d86b7c28ad3854c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:26:55 +00:00
TreeHugger Robot
d1c096bc56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c6e9ba1100 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib19ca47d04b3f250201329826b64f9e6e8b51c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:25:15 +00:00
Bill Yi
906b408520 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23c81a0a7f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5aaf8ae1adbc7f578b9ea6dc76d75b1a6c68f3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:24:50 +00:00
TreeHugger Robot
7448a4df9f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fa53f6fafe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f398660f3f7eb4b0a8ad0823302ed6b3215a100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:24:32 +00:00
Bill Yi
c7e2c34520 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31ea59660b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0bf5cd74a3c2a05f9e62346c7377cbdac3e3aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:24:19 +00:00
Sayak Dutta
3985485b3a Merge "Update back FooterButton visibility for navigation instead of back button" into tm-qpr-dev am: af11c676a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19682757

Change-Id: Iae792a3cb815612047ffb2c14fee3c40a19653d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:22:51 +00:00
Bill Yi
c29ab9bf8b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5 -s ours am: 5c691c0670 -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: Iea672469f43e5b1deda5fb6c7b75ba79c5c9adb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:37:08 +00:00
Bill Yi
78aece0998 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe -s ours am: 60f828e428 -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: Idff7c99bf3926e4138799fa53bc0317306a9158f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:36:42 +00:00
Bill Yi
56af244b80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2 -s ours am: 9281ec1752 -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: I13c2baa859f086fcb43624b88be0f5de477caf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:36:23 +00:00
Bill Yi
1c41a160c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours am: 381f37b918 -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: I4fc668bfd5013261e8a3205af9aa15f20edc14ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:36:09 +00:00
Treehugger Robot
cb302284e6 Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb am: 4c06c2426d am: 1467de15bc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: Ie73421bb80637e58b04772e20289a38d22a2a708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:35:06 +00: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
Bill Yi
0bc186ced0 [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: Ice10cfe5937d454d09b7e6e75c22060d7ed5300f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:22:04 +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
f2220437ba Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp am: ad5444df28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393

Change-Id: If3d42aa8f43328404c65ee659d1a5ebb438149b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 07:12:13 +00:00
TreeHugger Robot
614943029f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours am: a31f4bd4de -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: Ic97a2bd6beb54d3d555b80ed0377714f7ec0c04d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 07:11:58 +00:00
TreeHugger Robot
7132b78cd2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: aa3a5a8e5f -s ours am: 9313d8a22a -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: Id693f540436ffd8fe8a8745aaaa737ae667213f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 07:09:09 +00:00
Bill Yi
7bef9eab0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: c6fcf4dd69 -s ours am: 03694f9b15 -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: Idacf29303b59a4c8d8995b81e77a6ebcc018472e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 07:08:51 +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
bf23a06eac [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: I4dddfe717c2c477de4b1593c410ed821bac76478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:51:11 +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
Bill Yi
637265f9ea [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: Ifc7e47483fd939a4026d12c7dd3e13e9803b061a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:50:48 +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
TreeHugger Robot
c6e9ba1100 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-08-23 05:46:40 +00:00
TreeHugger Robot
fa53f6fafe Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-08-23 05:46:40 +00:00
Sayak Dutta
af11c676a9 Merge "Update back FooterButton visibility for navigation instead of back button" into tm-qpr-dev 2022-08-23 05:45:03 +00:00
Diya Bera
0b34834c92 Merge "Removed redundant face unlock option." into tm-qpr-dev am: 02ca9bd23e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19645603

Change-Id: I1ad6fb329ecfdcffcecd8bb80b6d300b7bc9e0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 22:17:53 +00:00
Diya Bera
02ca9bd23e Merge "Removed redundant face unlock option." into tm-qpr-dev 2022-08-22 21:57:44 +00:00
Joe Bolinger
d3b4bf7e03 Merge "Cache context for generateChallenge response." into tm-qpr-dev am: aeb042d965 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19662253

Change-Id: I668ff41be6cda1b42c8815eb5ad382ab4757e763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 21:22:40 +00:00
Joe Bolinger
aeb042d965 Merge "Cache context for generateChallenge response." into tm-qpr-dev 2022-08-22 21:04:40 +00:00
Oli Lan
fa1157048c [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: 5c46283548 -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: I26abf022c66735e7c44794911eaa47f0056c16f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:11:39 +00:00
Automerger Merge Worker
d30d0a603a 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 am: 19f1f4fb14 -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: I2dff5ada9e9d3dd76bee050cf1e946d9f52f7937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 17:11:29 +00:00