Zoey Chen
|
95c15f1f0b
|
[automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f am: bd8c589390 -s ours
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987
Change-Id: I25e081bb87845b2b286326eaad7f53573eb9e441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-31 04:22:36 +00:00 |
|
Zoey Chen
|
bd8c589390
|
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987
Change-Id: Iee27c40089c612cd2e9ac80a4fa218d707fffd0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-31 03:57:00 +00:00 |
|
Zoey Chen
|
31011d591f
|
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings"
|
2022-05-31 03:27:51 +00:00 |
|
Automerger Merge Worker
|
2773af62b8
|
Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 7e712ef660" into tm-d1-dev-plus-aosp
|
2022-05-30 05:05:51 +00:00 |
|
Edgar Wang
|
67e1606b5e
|
Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218
Change-Id: I1dd67111c2d18b8f41a318860ee751a3f6ec6aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-30 05:05:31 +00:00 |
|
Edgar Wang
|
e735b97709
|
Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 7e712ef660
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218
Change-Id: Iec98afd8781aa28bb0d15a66382f0f9c1d8d9028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-30 05:05:31 +00:00 |
|
Edgar Wang
|
1767504702
|
Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218
Change-Id: I584713ed38df60ecb9742f79f5cbc2e0c2ea90bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-30 04:36:10 +00:00 |
|
Edgar Wang
|
7e712ef660
|
Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218
Change-Id: I1e600321182b83edebe65bbc932222b4ea7bc4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-30 04:34:50 +00:00 |
|
Edgar Wang
|
610538e10b
|
Merge "Enable hyphenation on most of preference." into tm-dev
|
2022-05-30 04:00:19 +00:00 |
|
Treehugger Robot
|
7cf2c08b53
|
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 am: 22c4b4009b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346
Change-Id: I68e18d34ee0f28caac1da18f76472082eb524430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-30 03:59:47 +00:00 |
|
Treehugger Robot
|
22c4b4009b
|
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346
Change-Id: I1fd069da08f2931ee00c7adb08df56fc4fb976b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-30 03:44:42 +00:00 |
|
Treehugger Robot
|
2341b91f32
|
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346
Change-Id: I3435e3bf2ee61ad4be971334f791543d9c26856d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-30 03:27:45 +00:00 |
|
Treehugger Robot
|
24f96c2c2e
|
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info"
|
2022-05-30 03:01:23 +00:00 |
|
Ilya Matyukhin
|
28608774cb
|
Update biometrics OWNERS
Bug: 234195983
Test: N/A
Change-Id: I9843d0d6fad638cd14296624b11f86a273baab1c
|
2022-05-28 05:36:43 +00:00 |
|
Automerger Merge Worker
|
fd82bd854e
|
Merge changes from topic "am-0e4ff05ba9ce4e1494489f29f1a9e967" into tm-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 460dcee74b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: 496b722a23 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 7307f75d1e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: 684e2ab4bd -s ours
|
2022-05-27 17:16:07 +00:00 |
|
TreeHugger Robot
|
8961fbeada
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 460dcee74b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: I9d4f41f4aa4f17c2e770edc58f4068d076e568c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 17:15:14 +00:00 |
|
Bill Yi
|
cdd9bce547
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: 496b722a23 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: I6c6b803fbeedab5f119176aee5e0756e9335c67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 17:15:02 +00:00 |
|
TreeHugger Robot
|
0a6b06ad2c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: I2af98aa8a4a359128f1b8f590c1acd066e560f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 17:14:45 +00:00 |
|
TreeHugger Robot
|
dc033558a7
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 7307f75d1e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627432
Change-Id: If5fcec185f9a87fd95fd8465bc2fdfed4f76f8a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 17:14:45 +00:00 |
|
Bill Yi
|
6352a444cd
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: I6c5abe00d12f63faddb3d18a84b1ffe79e694d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 17:14:34 +00:00 |
|
Bill Yi
|
6a02a6a18a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: 684e2ab4bd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627432
Change-Id: I4796260a9141a72a4c95dfd5316ee50ca1283fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 17:14:31 +00:00 |
|
TreeHugger Robot
|
d221387e32
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627432
Change-Id: I10d5179a433ce1ff84fb5707dd4bb89eac3f75b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 17:14:18 +00:00 |
|
Bill Yi
|
5c1d9fb325
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627432
Change-Id: Ic26eb391782892a26649ccd080acdda511938a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 17:14:01 +00:00 |
|
TreeHugger Robot
|
460dcee74b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: If9a0a56197a12a7d7bc178d0bec11559e8d7c9e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 16:56:21 +00:00 |
|
Bill Yi
|
496b722a23
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: I5cce0ab8e7413f6e3ddf4fe7b1cd0321d3561fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 16:56:15 +00:00 |
|
TreeHugger Robot
|
56da28b680
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: I43e638073a5b58e2e72866101e72ecd66c865aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 16:56:13 +00:00 |
|
Bill Yi
|
cda0c42d9e
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527
Change-Id: Icabe13a3d76f22248a3fc6f27f9d8f206232548a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 16:56:09 +00:00 |
|
TreeHugger Robot
|
7307f75d1e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627432
Change-Id: I6eb2fd9487f6c77e5d62e5c0981d77ed3a977d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 16:56:00 +00:00 |
|
TreeHugger Robot
|
0f7ae55fd9
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627432
Change-Id: I0bba91cc0b512d6c8fdabbe84e1f12b679e76b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 16:55:56 +00:00 |
|
Bill Yi
|
684e2ab4bd
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627432
Change-Id: I32a92c567c667bd8a987b99d61c8fb01f9b058c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 16:55:36 +00:00 |
|
Bill Yi
|
d9de74c23a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627432
Change-Id: I62366470c595bf8351efffa900bae281c69e4d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 16:55:29 +00:00 |
|
TreeHugger Robot
|
8720510d2d
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
|
2022-05-27 16:45:14 +00:00 |
|
TreeHugger Robot
|
a55b8573ef
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
|
2022-05-27 16:45:14 +00:00 |
|
TreeHugger Robot
|
232db4bfb1
|
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: Id2d8b1c03ee685c0d0bca85ac9a569102d8aa239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 16:14:27 +00:00 |
|
TreeHugger Robot
|
a00962e0c7
|
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 58cc75e217
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: I028d9908e9510f2ae7cbebc36f9f23c0498155cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:56:37 +00:00 |
|
SongFerng Wang
|
edddac92a4
|
[automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 am: 640e337b19 -s ours am: 81d910a3bd -s ours
am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8b1 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107797
Change-Id: If7af8332cc0fa264020e72cae7c5a8d415b4f9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:56:21 +00:00 |
|
TreeHugger Robot
|
1340a91c73
|
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: Ifdd591d7f032facbfe0f0f6dfe6db587271ec386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:56:19 +00:00 |
|
SongFerngWang
|
033d0d96a0
|
[automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7 am: 5de8fbc299 -s ours am: 0cdfaf2eed -s ours
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795
Change-Id: I98ee0541846246d87e03eadfd07326d41a61966f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:56:19 +00:00 |
|
TreeHugger Robot
|
58cc75e217
|
Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750
Change-Id: I9da420078509e6aa2a8ec37f1929fcdd5f2b4ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:54:53 +00:00 |
|
TreeHugger Robot
|
07db5f4362
|
Merge "Fix can't change notification sound for work profile." into tm-dev
|
2022-05-27 15:36:13 +00:00 |
|
SongFerng Wang
|
81d910a3bd
|
[automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 am: 640e337b19 -s ours
am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8b1 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107797
Change-Id: I024566b56adef549b2992c235d4b202c00c7743f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:34:04 +00:00 |
|
SongFerngWang
|
0cdfaf2eed
|
[automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7 am: 5de8fbc299 -s ours
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795
Change-Id: I790378343eefb8e03232fe325e34209eb290557c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:34:02 +00:00 |
|
SongFerng Wang
|
31fed0ace4
|
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I6d335c12227d1be9bc6d753e940ac1994c050011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:33:56 +00:00 |
|
SongFerng Wang
|
86fd225f79
|
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: d879d59a86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I76b7ecd27dcf6b1e682cc104a389c9653b31320b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:26:31 +00:00 |
|
Betty Chang
|
d1e2280136
|
[automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d am: e300781fb8 -s ours am: 34c513f0d4 -s ours
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794
Change-Id: I3b9751da93651df23cbba4319d540943eced5d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:26:12 +00:00 |
|
SongFerng Wang
|
e4d42c1515
|
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I4c163ea303beefcf265ba6b67585d7559aab9ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:18:44 +00:00 |
|
SongFerng Wang
|
640e337b19
|
Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107797
Change-Id: Idcc44c3a8d41c74cb485c5cba0764989adc17a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:18:30 +00:00 |
|
SongFerngWang
|
5de8fbc299
|
Changing the condition since the esim may be removable am: 82bf2a66b7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795
Change-Id: If58f4e897785dd92ed6de2bd847bb5a7a9728294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:18:28 +00:00 |
|
SongFerng Wang
|
d879d59a86
|
Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753
Change-Id: I74352201ea603e7786ca6ee686fc9d6f142e7ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:17:25 +00:00 |
|
Betty Chang
|
34c513f0d4
|
[automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d am: e300781fb8 -s ours
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794
Change-Id: I1e1d2af2be4b97cbbeaa579963a7865f1c25ba40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-27 15:03:07 +00:00 |
|