Xin Li
|
69e79704e3
|
[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: bf45599d43 -s ours
am skip reason: Merged-In I9ac05f5da437030e1b5db082ddaf7959f82acccd with SHA-1 d3f9214763 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279041
Change-Id: Ibb132379ab32739f0c9bdc29ded3159775eb884e
|
2021-11-18 22:00:58 +00:00 |
|
TreeHugger Robot
|
062c92d459
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebd2e1f662 -s ours am: 9adb10d6fc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832
Change-Id: Idad6caf7532b3c1d08bf007708bb05a0212c95e7
|
2021-11-18 19:22:43 +00:00 |
|
TreeHugger Robot
|
026f820cce
|
Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev am: 6cae0edae1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832
Change-Id: I085605b91279dd2ff342a5e79b613ee3a35ac43a
|
2021-11-18 19:22:38 +00:00 |
|
Bill Yi
|
c4894489f5
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9 am: 61505e7824 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832
Change-Id: I6849598109a72f67c61be1f614e162cf9de38f9d
|
2021-11-18 19:22:36 +00:00 |
|
TreeHugger Robot
|
9adb10d6fc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebd2e1f662 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832
Change-Id: I47c73fbaece5fa90f127335d93cf439b7ec9e720
|
2021-11-18 19:22:29 +00:00 |
|
TreeHugger Robot
|
ebd2e1f662
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
|
2021-11-18 19:06:29 +00:00 |
|
TreeHugger Robot
|
6cae0edae1
|
Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9
Import translations. DO NOT MERGE ANYWHERE
|
2021-11-18 19:06:29 +00:00 |
|
TreeHugger Robot
|
db6bdc35f2
|
Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev am: 1ed1be15d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: I25e1e2e362a458362025d435667133d37621dd02
|
2021-11-18 18:08:20 +00:00 |
|
Bill Yi
|
931145f30e
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 am: d86da91c3e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: Ia5da598d10ce0cf7df291b92b5965363eb878b42
|
2021-11-18 18:08:17 +00:00 |
|
TreeHugger Robot
|
1ed1be15d8
|
Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
Import translations. DO NOT MERGE ANYWHERE
|
2021-11-18 17:51:48 +00:00 |
|
TreeHugger Robot
|
6e7435398e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294814
Change-Id: Iabd4701965c8f88c200a616310481fd330114671
|
2021-11-18 17:02:48 +00:00 |
|
TreeHugger Robot
|
0b17afd619
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294864
Change-Id: Ia12ac51a8a17c860a38f10da88ed70a73928394b
|
2021-11-18 17:02:38 +00:00 |
|
TreeHugger Robot
|
fda2135c78
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
|
2021-11-18 16:57:43 +00:00 |
|
TreeHugger Robot
|
277f726266
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
|
2021-11-18 16:49:54 +00:00 |
|
Bill Yi
|
2c292c3bd0
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1374d712733e84b14c7e8d7a030e5a2925e8fa7d
|
2021-11-18 11:14:31 +00:00 |
|
Bill Yi
|
61505e7824
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832
Change-Id: I1ba27aa6206d0f3397fa2368b2e0a7aee2872242
|
2021-11-18 11:11:02 +00:00 |
|
Bill Yi
|
10928bfba9
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic2a76b26c01ac12d38805cfe0e587bc6578cb031
|
2021-11-18 11:10:53 +00:00 |
|
Bill Yi
|
c3da08f9b3
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I14e8407dfd64beac27fc43769f7009427f477027
|
2021-11-18 11:01:28 +00:00 |
|
Bill Yi
|
d86da91c3e
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: I1988d2aea846cc00ec8929d7e898f821a686c5cc
|
2021-11-18 11:00:03 +00:00 |
|
Bill Yi
|
b8b0bef8f9
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iab997959a48aa05243e0d7029dc6a7262414a46d
|
2021-11-18 10:59:55 +00:00 |
|
ykhung
|
3c1da6b2af
|
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: I7588c48981e0a4f351302fd1b38f8c943509375a
|
2021-11-17 14:19:22 +00:00 |
|
ykhung
|
13a52a081e
|
Update "Mobile network standby" attribute label into "Mobile network"
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
(cherry picked from commit 22dc875ba7)
|
2021-11-17 12:35:23 +00:00 |
|
TreeHugger Robot
|
0bbf5438d0
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358
Change-Id: I356b281608f37db8d3683a20840bd274e4c5f26d
|
2021-11-16 06:57:13 +00:00 |
|
TreeHugger Robot
|
ed43498d71
|
Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358
Change-Id: Id969ace896b3a93fc3b3f60a442b65fa445f2a2c
|
2021-11-16 06:56:52 +00:00 |
|
Bill Yi
|
1ab9266897
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358
Change-Id: If64647c33ee377a6bd91099bc6fc81c33ecb9dba
|
2021-11-16 06:56:50 +00:00 |
|
TreeHugger Robot
|
868cb753cc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358
Change-Id: I55e9911e89da1f596826b485f21db1b943a60b35
|
2021-11-16 06:56:46 +00:00 |
|
TreeHugger Robot
|
36ae9f88a2
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
|
2021-11-16 06:45:14 +00:00 |
|
TreeHugger Robot
|
0bbc6e224f
|
Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e
Import translations. DO NOT MERGE ANYWHERE
|
2021-11-16 06:45:14 +00:00 |
|
Bill Yi
|
c2cdc020d3
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours am: 73bedcdd7d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353
Change-Id: Ic5eed8d41e7b9311f91bcf841f01e379e4904f29
|
2021-11-15 17:16:23 +00:00 |
|
TreeHugger Robot
|
b7cb455366
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231483
Change-Id: Idd94029e31ce22b03f792016670a89110adf3981
|
2021-11-15 17:15:37 +00:00 |
|
Bill Yi
|
73bedcdd7d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353
Change-Id: I2e8f62e50556e57371cddbcb7be02f75e0630cda
|
2021-11-15 17:15:08 +00:00 |
|
Bill Yi
|
16e6040e59
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6dddd1f0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231359
Change-Id: I75567b65694e64a0a3c663d2b7a59e63f63e0746
|
2021-11-15 17:15:02 +00:00 |
|
TreeHugger Robot
|
db01149e40
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
|
2021-11-15 17:00:27 +00:00 |
|
Jack Yu
|
2a2e0275cc
|
NFC support in work profile
Configure NFC payment settings based on userId.
Bug: 202367033
Test: mauanl tests
Change-Id: I97e275f374d34618b64188d5de185ec6c527e0fd
|
2021-11-15 19:03:34 +08:00 |
|
Xin Li
|
bf45599d43
|
Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I9ac05f5da437030e1b5db082ddaf7959f82acccd
Change-Id: Iaf8ebc4877a8276672354b45db0dd502c0f71bd3
|
2021-11-11 16:54:23 +00:00 |
|
Bill Yi
|
c91c41405c
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6ac727134512d558c3d0856b1aadfa1e998bfcf9
|
2021-11-10 18:51:11 +00:00 |
|
Bill Yi
|
b9dbf91cc7
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I70122c3010dc24d428cba88efb50b95275ee635a
|
2021-11-10 18:47:20 +00:00 |
|
Bill Yi
|
1c6dddd1f0
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6a07f66a40b073e21a143722639117320ac113b5
|
2021-11-10 18:37:33 +00:00 |
|
Bill Yi
|
1246b8bc86
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358
Change-Id: I612ad1b35d17933063a2d083bccf762b222a8273
|
2021-11-10 18:36:05 +00:00 |
|
Bill Yi
|
b546c8aa3e
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6739a3e0bbf088d750f5b1e52e5dd0f82bcf2be4
|
2021-11-10 18:35:55 +00:00 |
|
Etienne Ruffieux
|
e004eaa51b
|
Make BluetoothCodecConfig and BluetoothCodecStatus public
Tag: #feature
Bug: 200202780
Test: make RunSettingsRoboTests
Change-Id: I2a81216de050b143cee5c537d899a699d5012330
|
2021-11-10 10:12:51 +00:00 |
|
TreeHugger Robot
|
82ddadaca5
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 551e444c47 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: Ieaedcf8910b13d82fc823c627e14c98908bad347
|
2021-11-09 09:26:29 +00:00 |
|
Hugh Chen
|
d0b5804f61
|
[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: c1c7d536a2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: Ib71e4d440991494083ef8f7aa7cb8fc87e5f48b2
|
2021-11-09 09:26:27 +00:00 |
|
TreeHugger Robot
|
4ece52b415
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 156f041f7c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: Idee2032a84eec9ac10cf43fccbaba8d8119b3d58
|
2021-11-09 09:26:18 +00:00 |
|
Hugh Chen
|
99b4f6964a
|
[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 3d50e716e2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: I888cf516759c78d3e9847852db0af3092656aa3c
|
2021-11-09 09:26:16 +00:00 |
|
TreeHugger Robot
|
e1bc76a7ec
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 7a2bb50ebb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: Ia0ac55fa2096c09a3368ff7cda4bb6a099abdb82
|
2021-11-09 09:13:35 +00:00 |
|
Hugh Chen
|
c78c4e1a0c
|
[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: 24c1a557fc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: Ib762995f60f467c505f2b2360936b697f1ae7c93
|
2021-11-09 09:13:34 +00:00 |
|
TreeHugger Robot
|
1d4532c346
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 6b8ae36f00 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: I7a71b020fc7344f8d80f2671a1ef41e642fb1374
|
2021-11-09 09:13:26 +00:00 |
|
Hugh Chen
|
f63da59d5f
|
[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 6f423d2e28 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: Id683d7caea00a4e298884976c567f5e4c9de8ccf
|
2021-11-09 09:13:25 +00:00 |
|
TreeHugger Robot
|
551e444c47
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003
Change-Id: If5abd41926afc2cb82860ed4c567be70d3d96daf
|
2021-11-09 08:54:44 +00:00 |
|