PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,722 Commits 1 Branch 0 Tags
148f0a85910c21c80d03f4b741cd1c83cfceaa0c
Commit Graph

106722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
8f793f5e4f Merge "Fix the IllegalArgumentException from RecyclerView" 2022-09-14 03:55:49 +00:00
Automerger Merge Worker
808da23434 Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours
 2022-09-13 18:54:26 +00:00
TreeHugger Robot
338c608012 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: 73cfa8885a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I463ef303e41f838db56589f2e01d07168fe79cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:51 +00:00
Bill Yi
fd8f0fee80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: cd1753080f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7cb16d01b31890db0f2b5bc585120d9e52491b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:37 +00:00
TreeHugger Robot
9dbda868e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22d4e5beabb84f2f7eb204df23f62aee984fd82f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:32 +00:00
Bill Yi
63fc658151 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 92b538c0f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I204587378c45b54606f0faea021e442f0d5fffd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:25 +00:00
Bill Yi
7334ac9765 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54e65f48186d28ab71978cadb4d5aa6c9cb76ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:18 +00:00
Bill Yi
94b95cd07c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb42aaa4bc5b011d9c5397096e341818c06989bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:06 +00:00
TreeHugger Robot
dd445a736a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7dcc61b6ab4486462819e00f32ad0257eab4bac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:11:40 +00:00
Bill Yi
ffd1ed3a00 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I727cf5bfa8c148e0f589bd8c8e87aa8d59fd7c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:11:26 +00:00
Bill Yi
5020aeaf5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib510c3a81b652a330367a43560050f78531f34ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:11:14 +00:00
TreeHugger Robot
73cfa8885a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b0bb9c5644698a69ea1bac97dab0d14a99163fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:11:07 +00:00
Bill Yi
cd1753080f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28cc254ac98e63f6ca79b17a0e0938a5a8961ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:10:55 +00:00
Bill Yi
92b538c0f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1146a9d8ceea29a070889cab45fe93aeb1189b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:10:40 +00:00
TreeHugger Robot
d04dc24d56 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-09-13 17:20:55 +00:00
Shen Lin
c463aee2b8 Fix the IllegalArgumentException from RecyclerView 
Attempt to remove the animator as early as possible to avoid a RecyclerView crash.

Bug: 246411107
Related bug: 184214085

Test: manual.
Change-Id: I8fcb06836217f4de200a53bb88a1a0b5e42bbe21
 2022-09-13 08:46:30 +00:00
Bill Yi
65b45b6ecb [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: Ie01abae883d751824703018a75ef7a41de38cc8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 20:29:27 +00:00
Bill Yi
aab60c8d68 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours am: 517f250e13 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I17f23d231f04f41092a3be5ce59a732faad85b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 20:29:16 +00:00
Bill Yi
9c26bb64b8 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: Id4b69cddf31a9a3d0bb781d7fecd0f21d369c0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 19:57:13 +00:00
Bill Yi
517f250e13 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I9474f8a455c20b5335f584ba8261fd5b29435995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 19:57:01 +00:00
Bill Yi
3464e33135 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I20ddfee04e6de1e681b647a97296fcf29d97ce66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:56:26 +00:00
Bill Yi
49efcf7816 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I3e2c668af16aec333680c1ac7fad768b1db94c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:56:14 +00:00
Bill Yi
677cd61616 Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" 2022-09-12 17:59:03 +00:00
Bill Yi
a4f092c748 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie871e5bb344fce432b8741e50b34954cf5fc6ec9
 2022-09-11 16:28:01 -07:00
Bill Yi
f3457e4080 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iee13f8fc3f15a25a78f77111b5098b3a01d5ab8f
 2022-09-11 16:23:01 -07:00
Treehugger Robot
2d1b325cd0 Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a am: 693ce48efb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: If71d8f5e024a9ecc993ff35140995c3627c85196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 15:46:13 +00:00
Treehugger Robot
693ce48efb Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad am: 1f9c4c483a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: I2b246b643ff341ff8a2158cbabd3f4a33c04703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 15:18:57 +00:00
Treehugger Robot
1f9c4c483a Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: Ib115186ff66f8246082bc274624cb116a63c790c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 14:49:24 +00:00
Treehugger Robot
4378ee11ad Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" 2022-09-09 14:20:05 +00:00
Shen Lin
78fc8a21a4 Fix potential NPE crash in ConversationHeaderPreferenceController 
mChannel is nullable and we have to do a null-check before calling its method.

Bug: 245506600

Test: manual and atest
Change-Id: Ib739f0f66f1a2aee1b2741263e7c206341782892
 2022-09-09 10:16:29 +08:00
Bill Yi
89fe1313c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours am: 158bf69a42 -s ours am: 4ad699717a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic78f0dbf0eb4e14f8c10855fbd7219f70d315b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:58:30 +00:00
Bill Yi
bbd35cbe45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours am: f1d8ba94d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f20fbccb440dce4ae45998ab8714310476a3285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:58:12 +00:00
Bill Yi
19640b0bc2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours am: 28d6d5a7c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f4ced9ea0c104aeabf97c3b7f1634aecda90330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:57:51 +00:00
Bill Yi
6b4251e977 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours am: 21d705a708 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79d399648536010692a04b480678a24e5cbbd58e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:57:44 +00:00
Bill Yi
4ad699717a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours am: 158bf69a42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic565c19863d34961aef5dcce39ade416e816fcf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:06:50 +00:00
Bill Yi
f1d8ba94d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5c0d891ea8d91e1e1c1868e90456ff59947772f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:06:36 +00:00
Bill Yi
28d6d5a7c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id56eae08a39ddea4e76a27b0bd0887c06d2ef392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:06:15 +00:00
Bill Yi
21d705a708 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03897f87ff0fd32328f2de1d6c7f044ca58ab1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:05:54 +00:00
Bill Yi
158bf69a42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77337c147a9468ff174fd851e58cb968723b3203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:58:13 +00:00
Bill Yi
19de182abb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0357173f1cbe8056bdd872376aeb226a8cddc995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:58:01 +00:00
Bill Yi
5f1549cee7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90137c2b7dcdabd0e11ec09548224f59e42b2a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:57:38 +00:00
Bill Yi
2fabfd31d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5d7147bdcfb6ed4c19544f572416b3cb9278454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:57:17 +00:00
Bill Yi
976f702727 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-08 21:31:01 +00:00
Bill Yi
09b685534a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-08 21:31:01 +00:00
Bill Yi
042554a0e4 Merge TP1A.220905.004 to aosp-master - DO NOT MERGE 
Merged-In: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Merged-In: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Change-Id: I186ff56c007d17ad650b64facfbd4862cc06bf9a
 2022-09-08 14:23:20 -07:00
Shen Lin
e960694a15 Fix compile warnings due to non-varargs call of varargs method 
Bug: 245384099

Test: manual
Change-Id: Ie25c53b20cad318097ff17b7df0b4dd9ffeb4a32
Merged-In: Ib225d185b6f15463f4fae809e0cdaa25920d52af
 2022-09-08 07:02:52 +00:00
Bill Yi
cdaad5b066 [automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: e7e935454f -s ours am: 62d1c9a527 -s ours 
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history

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

Change-Id: I33b90519ccd96615fff46e33542ae440117779ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:18:47 +00:00
Bill Yi
e655a213ec [automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: e935326ab9 -s ours am: d8e775a59d -s ours 
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history

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

Change-Id: I7efd3d9b2e032e746f71e5697bbf041fd351248d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:18:36 +00:00
Bill Yi
62d1c9a527 [automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: e7e935454f -s ours 
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history

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

Change-Id: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:14:23 +00:00
Bill Yi
d8e775a59d [automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: e935326ab9 -s ours 
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history

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

Change-Id: I8dfba5cb143b8a3e85d5cd486e259b620b133cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:14:10 +00:00