PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,422 Commits 1 Branch 0 Tags
bb49ef02f99e66648d8dd0eaffe05c07f7e87c5c
Commit Graph

124422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
d4e2709506 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours am: 0df1e40d65 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f7bfc71ff5ed20b2e7007b9d146741b00b2a762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:26:17 +00:00
Lin Yuan
f94aae1766 Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c am: 42188dcd5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: I64705175f3a4ff791baf2cece3b528f24814bc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:24:56 +00:00
Lin Yuan
7d2f92b77e Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c am: 383923a4df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: I34b6aaddeecbfa05953b5a568d4890c679c6a915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:23:13 +00:00
Lin Yuan
383923a4df Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: I95812cb79e5e8ff8bce5f9af9e1eff79aee44e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:21:46 +00:00
Treehugger Robot
be3f127d91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours am: a937eb6cfc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9885d6779e156715f0c26e6199ecfa4451a4fcee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:17:41 +00:00
Treehugger Robot
13b2843d72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours am: 485ae146de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18a5daad08d50f46a1736e308e82ed530115b810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:14:45 +00:00
Lin Yuan
6c3155eb61 Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: Ie2f5204a3a4d0dc4372fc7bfb8582502da792e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:13:55 +00:00
Lin Yuan
42188dcd5f Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev am: 0bb504c42c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22833947

Change-Id: Id62429c88143a63acba005d035d4c4d2699e26f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 19:36:28 +00:00
Lin Yuan
0bb504c42c Merge "Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency." into udc-dev 2023-04-25 19:31:35 +00:00
Treehugger Robot
a937eb6cfc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a0245aced46e867e7de680ef15dde00fc6d3e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 19:29:20 +00:00
Treehugger Robot
485ae146de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b72c194d13f9087b43a420433b3126291b2920c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 19:27:38 +00:00
Treehugger Robot
0df1e40d65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours am: c7f8ae5369 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id119791e36ea8b96cd2a4046fd00c76ff2a2f0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 19:13:12 +00:00
Treehugger Robot
3747961aaf Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e am: ed9f22b78a am: 5f160e1562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: Ib32605bc57d46f94d98a58b2e077687475e872f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:38:09 +00:00
Bill Yi
5d77d702cf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours am: 0a2936d879 -s ours am: 37fab052e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic46a93e21054d71f41c8d781dd3255412af49dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:37:32 +00:00
Treehugger Robot
51b5a14dc8 Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e am: b0bcad3210 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: Ib5acbdb5714516048b9bc687900dba997d0167e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:31:49 +00:00
Bill Yi
62f0a5d938 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours am: 9bd3a732d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ace9cae4ddd13aeafdb614a2c22d1b311abbd7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:31:10 +00:00
Treehugger Robot
c7f8ae5369 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 32873d192b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5c9a7f04b6701169c45039cd955bd356a86a240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:31:07 +00:00
Automerger Merge Worker
a4087417f0 Merge changes from topic "am-2885c7fd0b6a4f7fb5c86c6e0f3706a9" into udc-d1-dev-plus-aosp 
* changes:
  Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e am: 281aaed283
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours am: 457185d226 -s ours
 2023-04-25 18:20:57 +00:00
Treehugger Robot
c25e21398f Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e am: 281aaed283 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: I439e777d9c7c5723dd3fb3fb4f9f9e7fde062291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:20:08 +00:00
Treehugger Robot
3054854afe Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e am: f92fc6027c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: I2e369fefbb5ebd304d60d99d9551603858223af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:19:47 +00:00
Bill Yi
f791f438b7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours am: ff1898d970 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb1020c4d215f39ca6522d3a123ecd2f25f12c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:19:39 +00:00
Bill Yi
b998328021 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours am: 457185d226 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebb1bb5743da9bc8baa3b34395951f3337a6b87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:19:28 +00:00
Treehugger Robot
f92fc6027c Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: I04cc1158889cdf06dac76bf66155f50d0faead4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:17:03 +00:00
Bill Yi
ff1898d970 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iedd7cd020c217132bd4c2f18169c6de2394f03e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:15:54 +00:00
Treehugger Robot
281aaed283 Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: I68de386f4bf0b59ee1c287d80bfa11637fafdf46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:12:02 +00:00
Bill Yi
457185d226 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38b647218f87c8cf818dcdcdb7d7876e416de256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:11:10 +00:00
Treehugger Robot
b0bcad3210 Merge changes from topic "tc_change_23042206_48" into udc-dev am: e26112e56e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: I8316fb47446cf5308f2e5c8c3b4a3efc596fe5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:54:42 +00:00
Bill Yi
9bd3a732d2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9768cf0e3ebbf17204c29158d2cbc11f49bea3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:54:18 +00:00
Treehugger Robot
073e21ffeb Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e am: 26adf38f78 am: 4c78f9cdf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: I918a7c552551d9866d7e9964f45699edcbb7b1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:51:26 +00:00
Automerger Merge Worker
21e0d3f4d0 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours" into udc-dev-plus-aosp am: 5e3e804b39 -s ours am: 294c5a72bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d4bf0d929d72fcc5f28d9a4520a03c053759d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:50:50 +00:00
Bill Yi
b1517e13df [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours am: 27bc142960 -s ours am: 4d378ddc21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I056b748d01f6a955d583676344fef9fb8e1919b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:50:39 +00:00
Fangqiu Su
13fdff36ea Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18 am: 5ed8e6bc0e am: 6b6044bedb am: 0f1ca5b569 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ie741b7c5244982a85336078ceccc606c25fea519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:49:58 +00:00
Chaohui Wang
d5b178870a Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 5fba57460c am: cf47befb50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: I12f25e4b54db4f250f5c87c737ef7aac23ac2139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:49:43 +00:00
Treehugger Robot
e26112e56e Merge changes from topic "tc_change_23042206_48" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-25 17:49:42 +00:00
Treehugger Robot
32873d192b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-04-25 17:49:42 +00:00
Treehugger Robot
7192683db1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 646e95241d -s ours am: c55501f7c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id72527423e81e076045dcbcc7feded9ea75dd900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:48:32 +00:00
Bill Yi
59f12fef8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d4b01e8c9 -s ours am: 9a68370305 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia05ce5fccc6302f805ac72ca3bb4d08772efa168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:48:29 +00:00
Treehugger Robot
cb50d56ca0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 103dfefdad -s ours am: d704607b35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05f554e5dee898b5ee8ee25bc72cdd4b82e13b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:48:19 +00:00
Bill Yi
c5e2788132 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c43541f1c -s ours am: cacff81257 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb5a6d2fcb7b4d8227b90e7541981d870f9bdcb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:48:07 +00:00
Treehugger Robot
f879b8ed8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 29ba678514 -s ours am: 9baf7e3fca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ccee8638b16b9dff0c54e04ff0bcc31504734cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:47:37 +00:00
Bill Yi
eee99582a0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f92177ec1 -s ours am: 1920f8aa93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61d24bf6df10bac54d0bc8d32ca02a34bc4f4df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:47:06 +00:00
Treehugger Robot
3a1955f7e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 6a0935a34f -s ours am: 0e084ba633 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9318a5fac4fc1eca71a07979cf8cc8f466ae1d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:43:54 +00:00
Treehugger Robot
a4ef2cdfcf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 6a0935a34f -s ours am: ee690ca0eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia404e46fb999a3963c2a25fb6f5ff92e0826d3e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:43:53 +00:00
Bill Yi
100c003117 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours am: ffe604c85c -s ours am: b9e6bd201f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I162954eb0e39fbb51928077bef4026e8645aa4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:43:28 +00:00
Bill Yi
9d260b5cc5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours am: ffe604c85c -s ours am: a3dc766061 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I350192aeb65c966e1b72bb79a8eee5d70e641ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:43:18 +00:00
Chaohui Wang
050cc72bfe Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 7823686740 am: 6ec804e4eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: I50119040f7742a87122002745414ff1ccc2da02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:41:35 +00:00
Treehugger Robot
bb734a9397 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 6a0935a34f -s ours am: 114f7ae8a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I633975ad1675080a00814aeb4c03e4b40176d4e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:40:51 +00:00
Bill Yi
5fb8a7edcb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours am: ffe604c85c -s ours am: b0cb91a1bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb7b3236fe616e6cbe5bf30493774a97a0ca3324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:40:30 +00:00
Bill Yi
37c644a257 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours am: ae326b5f83 -s ours am: 92afd34258 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae22be87782e14ade805be087ad2174c2ba32e87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:40:24 +00:00
Bill Yi
10d724441d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours am: fc348ab76d -s ours am: e0e2df5e16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb68da295d8ff681f21990c13b80c46645157317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:40:21 +00:00