PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,729 Commits 1 Branch 0 Tags
fa3de1919bf03451fd1a7809b88eaaaeb451838c
Commit Graph

109729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amy Hsu
bfaf38ccb9 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 am: 7af580d08b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: I8baddc41e02614de807e48614c06d6d862cf6dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 00:53:24 +00:00
Amy Hsu
2897d2fa42 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: Id18e737daee4dd59b79662ac1b23ca114e0af275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 00:39:20 +00:00
Amy Hsu
7af580d08b Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: I74384b25ead713af83acc06434d57ae3214739fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 00:39:16 +00:00
Amy Hsu
eca20b0820 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev 2022-05-27 00:17:19 +00:00
Tom Hsu
2a8ee8005b Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 90875efc90 am: 1db2f02c9e am: 7b0a3f2080 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: Id20940ae94c871e13066769b96c25161e54f422d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 17:14:49 +00:00
Tom Hsu
ac755c2ee0 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 448ca95a7a am: 8feed45265 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I994fae4155c101c1fab7c5d7a8a3d29abcc6b17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 17:14:40 +00:00
Tom Hsu
05774d7d17 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 019d251814 am: c421f73232 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I128d5a757c37f225ee7b3a4362b2ec9beea65fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 17:12:55 +00:00
Tom Hsu
7b0a3f2080 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 90875efc90 am: 1db2f02c9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: Icd797bfb567df5c5be7627ccdfaf6c1928cd8c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:40:57 +00:00
Tom Hsu
8feed45265 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 448ca95a7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I59a3c4f57061b1395e24be2057747db67a59b5a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:39:35 +00:00
Tom Hsu
c421f73232 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 019d251814 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I73a3179f80439761e4af8e1b637d7d9b4341e55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:39:20 +00:00
Tom Hsu
c6b8c119d9 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: b7643967fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I2ea2d9841210c250215b521639f200d8a46692b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:18:37 +00:00
Tom Hsu
1db2f02c9e Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 90875efc90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I045ded0a1212e4baf53f4fd5577d072e70798387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:08:58 +00:00
Tom Hsu
448ca95a7a Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I5c427bb1620b6f31657524c944c0ab01fc33452a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:07:39 +00:00
Tom Hsu
019d251814 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I16eef92f8fca756292ebade85c71601ac273bff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:07:36 +00:00
Tom Hsu
806582197e Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I56919305722783a24bd68c0e378cc1d272a6f2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:41:44 +00:00
Tom Hsu
b7643967fd Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: Icf98100ffd11b54cfd7a2c3ce62273c9f62a21f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:40:36 +00:00
Tom Hsu
90875efc90 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I3c6ddf5ca206114fa677a06a7086fa0eb75b0752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:40:10 +00:00
Bill Yi
753ec22555 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 4a3e1660a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6e8c0b5ec42d386527074c421d2533b0c2a1b42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:28:55 +00:00
Bill Yi
9dc0b9f669 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: 35d85132c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia02ac03a23d748ccdaf27d1f8d7e4a9ae82ef879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:28:49 +00:00
Bill Yi
543d507143 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: 13f2373302 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I535af30839a5356138e85dc786c01658015b214c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:28:34 +00:00
Bill Yi
16526176ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 258eb6ddd7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5585cb2a53c3f261798c706ec9fc2f085fed8dd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:28:20 +00:00
TreeHugger Robot
c0fd8ddb35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 0788d46661 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I770d88c667b7dae2bb0bfcf763a6bcff8724391b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:18:14 +00:00
Bill Yi
4dcf0ac994 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d618eb19e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6cd128f333f62fb7dd50a065815347d926357de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:18:00 +00:00
TreeHugger Robot
2eb9ac093a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5e25fcdb1c -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I680c55a96d66bd3fbf21f178c573bba717b66ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:17:47 +00:00
Tom Hsu
f6ea9c99b3 Merge "Fix wrong summary string show on the network page." into tm-dev 2022-05-26 15:06:00 +00:00
Chaohui Wang
408713b0ae Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524 am: 9cdc977bd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672

Change-Id: Iac68b15d5e00df4b33428694753952379ba86e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 14:05:31 +00:00
Chaohui Wang
d4e7b964a9 Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7 am: 61d024789e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961

Change-Id: I75eedc2111df6aea01bcf0f85f7b1d7d82bbc55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 14:05:24 +00:00
Chaohui Wang
5bcbe80574 Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959 am: 2ec47367c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472

Change-Id: Id3aeac20db63efdf53e5dc2db8641a349ac8538d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 14:00:57 +00:00
Weng Su
650afe84a2 Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40 am: b3e2f1ad03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087

Change-Id: I98fa010c3800d9bdde273c2f92e9dfa362f3d20e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 14:00:50 +00:00
Daniel Chapin
c4cf80ff15 Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 571cd4f397 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: I1d08bd379521934b396d822a1278df98d197df7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 14:00:43 +00:00
TreeHugger Robot
36edf4ee92 Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f am: 5bf433a0d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252

Change-Id: Ib98ad143baf24e76b75c7543f4a1393de6b2655d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 14:00:36 +00:00
Edgar Wang
530def44cb Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865 am: 747ec1cc5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669

Change-Id: Ica9f3da8d6e1ff494526fba03b9a60236099495e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 14:00:29 +00:00
Binyi Wu
b21e74c0de Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250 am: 8e5bf213dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457

Change-Id: Id816565fce90c49792b1c4dd4a30d064ca836be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 14:00:22 +00:00
TreeHugger Robot
3db3abb50f Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc am: c54400980a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664

Change-Id: I3a25046252377771454c93b46e194e6dcb01e17a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 14:00:13 +00:00
TreeHugger Robot
47124d475a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d -s ours am: b10a49aa9b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d86913894ac6bf0b3bdda6385670df507c393fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 13:58:00 +00:00
Bill Yi
31655f70f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302 -s ours am: a16ae9af90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94b1ad095f7b9988b68a86b641d1e5e2348773dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 13:57:45 +00:00
TreeHugger Robot
9021a4540d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours am: 5427fb0dbf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9ed6228fee17a66561fe744057a9681605648d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 13:20:27 +00:00
Bill Yi
3c785f96b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours am: 5fac07d5ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaeefda0da68a92ef946f0a95cc21c63e34507542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 13:20:11 +00:00
Bill Yi
347cd74107 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours am: d28e552f18 -s ours am: 223c361bb7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50a04d0baea337baf7c6ef59b3dbaea29ab55e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 13:16:55 +00:00
TreeHugger Robot
c48ad0c158 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f398b474af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7da5215c8f19cfd66d3bd82747ec0a71e08b5122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 13:08:20 +00:00
Bill Yi
8f3b9d81da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db9218dcec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I110fadfbad6244c35641ad2005cd59b73f5033a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 13:08:10 +00:00
TreeHugger Robot
fd24e6b3e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 256d5aef09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9677d36c9cf3f0de9c058ced91ca5047c7f2b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 13:07:54 +00:00
Bill Yi
1fb12d7b3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 535ccbdbb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I87668d15ac1a0df65aea941b366afb38dbecffea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 13:07:39 +00:00
Tom Hsu
813279446a Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572 am: 1d10e1b709 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18491260

Change-Id: I76031861e9d44c3859500d2d8c717672ff46bd91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 12:26:42 +00:00
TreeHugger Robot
c98887cf28 Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 am: 6726e22900 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455

Change-Id: I6d90c41f9b96f425d25281f6e667e3066f5b1e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 12:26:35 +00:00
SongFerng Wang
6cdb6dc779 [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 am: 93e5302f36 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 0167a4d8a6 is already in history

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

Change-Id: I0b1ecb7ec6832b55b9690fe6b210bffeb74486f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 12:26:28 +00:00
TreeHugger Robot
1bda55cb6c Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: 949fe61ddd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: Ideb97dbb9db77a39e18225b16d8f362f87a95f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 12:26:19 +00:00
Bill Yi
c76842b6cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: fb1885708b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic843cf81def18fcaf3eb6fb578ae864710f5bd70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 12:25:52 +00:00
TreeHugger Robot
d0e16b2cdf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: b307e7f12f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I213be9b76a3102e60890990d01b3ac2765aac850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 12:25:44 +00:00