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

106715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Mccloskey
5a761a8198 [automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 -s ours am: d7855afb3e -s ours am: 2dbdde4582 -s ours am: d9987e0e0f -s ours 
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: I3fd0ebc17bc9c03104885fc490432fe6f9f58953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:23:56 +00:00
Joshua McCloskey
9c5d9991c8 [automerger skipped] Fix final UDFPS enrollment haptic. am: b7f3001cea -s ours am: 8495275d81 -s ours am: e63e2c4483 -s ours am: 19cc020f09 -s ours 
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: I4d1e5d5452815bfb7968d46e910716a9037eb1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:23:54 +00:00
Bonian Chen
03c63525b8 Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: b32415b955 am: 907156d04f am: 0d3883baa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069

Change-Id: Ie34e03b41b9abfb787cd25b66b55bdc719094ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:23:39 +00:00
TreeHugger Robot
d903116617 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1f09bfbaf3df7feed03fd2585032e063626c393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:22:45 +00:00
Bill Yi
471a93781b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd3d6ecae92bf38cde1fc6a83872a7ec366b73cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:22:27 +00:00
TreeHugger Robot
6389cb3f8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaecdd3202593c7f84cd6e779d79cac5d4edd0742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:20:24 +00:00
Bill Yi
74507642b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d4df6d4ea79c3aa509a10574d8f041b4837e6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:19:57 +00:00
Bonian Chen
10ebbc8cc3 Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 01e97e371e am: 2718dea3f8 am: 409e87760d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: Icc6b3133ae8e4bd3d1fb53d38d14590823d88aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:54 +00:00
TreeHugger Robot
c829be9ed7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I174f698a6651063795fd84edaddb8e3bc25ad2b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:52 +00:00
TreeHugger Robot
b6a4be3395 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours am: 341a2953e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd683fee3e8d302c30946460f852e4110d54dbc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:47 +00:00
TreeHugger Robot
a1c78fb744 Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: d1c67e389d am: 5c851b28f7 am: fbcb6198ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823

Change-Id: I6514ff6216854d2b5a1ec71c3c777fa3ad4f20ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:44 +00:00
Bill Yi
1446433485 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36758de26bfd43ec686704af56bbc72417802bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:37 +00:00
Bill Yi
0cc0806e01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours am: bfb7bb08ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0a9b6105e134395774500bff1f86d4f3dbfacf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:36 +00:00
Jan Tomljanovic
205aef1cb5 Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69 am: 3c357dec8a am: 1ef1f750e8 am: e228d4e72d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249

Change-Id: I96902fa4e606d45835455521fc2456d573b133ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:33 +00:00
TreeHugger Robot
485a0f01ff Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: 1c16e6b314 am: 431c7ede2b am: 3d4ffc67d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822

Change-Id: Ibb698f3d818c78996ba7da9d13462168c31956c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:23 +00:00
TreeHugger Robot
f32c08af1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0123563e51c4dc282e0aba58fb51d08980f9d40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:22 +00:00
TreeHugger Robot
0c0d2fa0ba Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65 am: 7d1f75839d am: 5ed72fae84 am: 070850b528 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885

Change-Id: I828ac0530a2967162822f460248c6560c8665853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:12 +00:00
Bill Yi
ee38ae11ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90d9567d06f163e2e47a6ad7522f86355ecc272c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:11 +00:00
Chaohui Wang
046eada25e Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: 19356dae5d am: 74030a5bc5 am: f75897acd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070

Change-Id: I8c3b09809c23a65129075ae001c286bf36ebee7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:02 +00:00
Tom Hsu
79e8a03137 Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6 am: 169517aacc am: 3521d0420c am: 71b96c18e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882

Change-Id: Ia4be127d847c382f082d0c4f942855c76966424d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:17:47 +00:00
TreeHugger Robot
56012b6bb0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93430c476feecdd32599576cefe10738155909b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:17:09 +00:00
TreeHugger Robot
b30ca6974e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib62e260acff5d5752062eb6992b4aa666be6eaf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:16:43 +00:00
Bill Yi
4970b3783e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83d9202789b11983a8bf6e1c2d157330e16c8fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:16:32 +00:00
Bill Yi
d3d4832f60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75373ff6bfe903e80e6eac9f016466e973474ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:16:00 +00:00
TreeHugger Robot
414ba3666c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7ad30cf6c51e704ee9ef1cdefa08848274ff7d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:15:20 +00:00
TreeHugger Robot
93a954046f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I637f9d638000e16c1ca16fb15375826069152cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:14:59 +00:00
Bill Yi
2a9a803489 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibebfbe157b332db17626ce33651f157a551e7969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:14:54 +00:00
Bill Yi
6944f72f53 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a46b2d7667905a79a7eebbe979167545e40865c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:14:35 +00:00
Arc Wang
aa4ed4d454 Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a am: 7a530c79ec am: 3af1d90a43 am: 2c4a835b27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167

Change-Id: Ib2cb37141b2529801dc3d9d3194b9a56dad4edd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 00:55:22 +00:00
Julia Reynolds
d445fe4252 Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: 1f912cbfe3 am: d9d09bf112 am: a7c0ce5cae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961

Change-Id: I1f5c6c718dd5690af4a6965d905d8997cd313f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 00:21:07 +00:00
TreeHugger Robot
e8650ff934 Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 6708570e2c am: d266df1531 am: a00a24bace 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824

Change-Id: I23da6999595cd81c735734d0c422844825438700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 00:20:53 +00:00
Calvin Pan
747688b636 Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 38fac79ee6 am: 492fdaf058 am: 3e087ae99d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006

Change-Id: Id404a57859b3dc049967e2ae39962f97a0e716ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 00:15:38 +00:00
Betty Chang
65fbc878a2 Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: ec17c47421 am: 3ea06f174e am: 8ed506d860 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166

Change-Id: Ib5c4b12d00956d6855839552db03ebab01b1564e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 00:13:25 +00:00
TreeHugger Robot
650ff58d75 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-03 23:31:48 +00:00
TreeHugger Robot
81b94adb78 Merge changes from topic "tc_change_32" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4d117cbc4
  Import translations. DO NOT MERGE ANYWHERE
 2022-05-03 23:31:48 +00:00
TreeHugger Robot
1640f6f7aa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-03 23:31:48 +00:00
TreeHugger Robot
87e365c6e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours am: 053bd1f8ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbbf82b813a3710d983fb667343205903f568ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:59:19 +00:00
Bill Yi
7f13849ae7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours am: 1025a9751f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I100b6d0889e501acf1d33a287e98d046b2c97127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:59:05 +00:00
TreeHugger Robot
0f6f7464fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9fc143a21e0d6640577be9a66ca467ec32e06cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:20:42 +00:00
Bill Yi
178808f178 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I584bcc0994dec00a847db344c5862781575c66ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:20:30 +00:00
TreeHugger Robot
e8a5cb6abf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id21a2bca3c5bf57d2afeeb77a0264f32e45ced34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:05:08 +00:00
Bill Yi
ce985a63f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc7b78ee0ea027944273035763749d0af7a4b65e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:04:39 +00:00
TreeHugger Robot
341a2953e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85cd0b7257faf828bdddc4139510757047829e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:02:03 +00:00
Bill Yi
bfb7bb08ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5b2d6adaff63ca1bf03755d251d23fb99955a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:01:47 +00:00
Xin Li
c3a9ea7443 Merge SP2A.220505.002 
Bug: 231319788
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
Change-Id: I225d05e638e099971b596b8ceeb8bf7bcd8778bd
 2022-05-03 20:53:03 +00:00
Bill Yi
9aefbd74f6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-05-03 20:49:52 +00:00
TreeHugger Robot
053bd1f8ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5430188911ae3f1c178a87369f7f1a20f47b1c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:49:40 +00:00
Bill Yi
1025a9751f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic6c9925cdfc653205b4c4377c19848ea74eee704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:49:11 +00:00
TreeHugger Robot
c5148a79ad Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-05-03 20:49:10 +00:00
TreeHugger Robot
d802445bc2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:48:56 +00:00