Eric Biggers
|
e4b84b22a2
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: e10ad67f99 -s ours am: 87bbc90fbc -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I613f436db76f399cea7da4031ca44e6198c1748f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:01:41 +00:00 |
|
Eric Biggers
|
1931bcbff7
|
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 5a04afe7dd -s ours am: 260fe8334e -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I997010051edf8a420b02685805ffa2ba511fa8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:01:21 +00:00 |
|
Eric Biggers
|
b2b5920f9a
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: e10ad67f99 -s ours am: 7b9099571c -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I38b879543a962ba25f93ed47c0da4cccf9a511ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:01:17 +00:00 |
|
Eric Biggers
|
503317bba1
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours am: 92939c1eb3 -s ours am: 64f3b181ab -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: I4c2220f0eaa954039c28c64e27e9a399810aa179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:00:55 +00:00 |
|
Eric Biggers
|
17fe44ed38
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours am: c748718a68 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I02219deedf80b230b10a3199e026547bc036aa42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:25:47 +00:00 |
|
Eric Biggers
|
3e42e78caa
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours am: d01ae4c976 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I1e78f3cf601ad5f2dc1629add5c4553e39d3107a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:25:19 +00:00 |
|
Eric Biggers
|
9c22ad2b3c
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours am: 4241da06f6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I8a83b0f09d00f791f6965390acb9255472fcc61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:24:44 +00:00 |
|
Automerger Merge Worker
|
3b26ca583d
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours am: 2b385e7da2 -s ours" into udc-d1-dev-plus-aosp
|
2023-08-08 05:24:40 +00:00 |
|
Eric Biggers
|
61785ffddd
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours am: 4241da06f6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I85f8476bab209983e7bb80de4b2fc9bb38aa678c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:24:11 +00:00 |
|
Eric Biggers
|
c593e644db
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours am: ea0207c908 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: Ic5bc56b8aa4360e4a7a3befa059c2dbdb963ea4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:24:02 +00:00 |
|
Automerger Merge Worker
|
1eb56a1e47
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours am: d60572e3ed -s ours" into udc-d1-dev-plus-aosp
|
2023-08-08 05:23:50 +00:00 |
|
Eric Biggers
|
8a0045b284
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours am: 2b385e7da2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: Ie49decd79bd3094747991ed216dcb532959ce601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:23:45 +00:00 |
|
Eric Biggers
|
cdf5989035
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours am: d60572e3ed -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: Id00bcd77e55e93a9771eb25f896cf3dbebbdae33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:23:45 +00:00 |
|
Eric Biggers
|
ae39fa7e2a
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours am: 57e52a7da8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Iba0401f8b4b555ac25cd77eb381bc92b07ce24c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:23:03 +00:00 |
|
Eric Biggers
|
5621f2a1fd
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours am: d60572e3ed -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I494185b050e33a4282a9ab6bd72e51819c884aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:22:56 +00:00 |
|
Eric Biggers
|
a837b676c9
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours am: 32ba927770 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Idad037463ce0087bc646cfd1997b3af3b5630698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:22:37 +00:00 |
|
Automerger Merge Worker
|
2df94229d9
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours am: 57e52a7da8 -s ours" into udc-d1-dev-plus-aosp
|
2023-08-08 05:22:35 +00:00 |
|
Eric Biggers
|
a39b54d2f9
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours am: 7ae93284fc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: I02d5c90ec065d8682d36970bd437584ef7b2ee1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:22:11 +00:00 |
|
Eric Biggers
|
260fe8334e
|
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 5a04afe7dd -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I4fcc007e768fea95d251401a5b1a96e6de79178b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:22:05 +00:00 |
|
Eric Biggers
|
7b9099571c
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: e10ad67f99 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I899e3d112288825ddab9fb5e7cc9b764f009ba3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:22:02 +00:00 |
|
Eric Biggers
|
c37e45ba7e
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours am: 57e52a7da8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: I9675a2c3c0a0df9233904b85d4edc040b7546b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:21:43 +00:00 |
|
Eric Biggers
|
a2712b2b5e
|
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 2e92835b46 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: Icd13605e35d704f2312c9143ba315e95a2bc5cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:21:19 +00:00 |
|
Eric Biggers
|
8861dc9544
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: 50261c4b0a -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I345cf249d5c7abb81c84b417b941cbdc6fe0105c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:21:12 +00:00 |
|
Eric Biggers
|
bf38eea5e6
|
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: d8fb55ae4d -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I3b817b07996505def9776b4bf3de83593403e76c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:20:29 +00:00 |
|
Eric Biggers
|
76add47858
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: 35a71fed88 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I14fe34599facb697708acbd54de4eff5aeeec6e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:20:26 +00:00 |
|
Eric Biggers
|
b87c5aa1a9
|
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 5a04afe7dd -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: Id613ead412c1699ff9a6472756aed0ff75e2f1ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:19:50 +00:00 |
|
Eric Biggers
|
87bbc90fbc
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: e10ad67f99 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299128
Change-Id: I30f5f5a862094579bbaf10ac258bbbe2b74309b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:19:46 +00:00 |
|
Eric Biggers
|
1679e7f685
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: f050fc11ca -s ours am: a78f35b23d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I9baf376067e9c14f416294adb2c1b1a63424e8ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:19:34 +00:00 |
|
Eric Biggers
|
179b563079
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 6ad8bea7c9 -s ours am: 618272911a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I24ae68dfb0c46cf6d50597586de3a68e32371359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:18:33 +00:00 |
|
Eric Biggers
|
64f3b181ab
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: c598a4cf48 -s ours am: 92939c1eb3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: I25ab77dab7356d28eda796e71815cbd529cf859a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:16:48 +00:00 |
|
Eric Biggers
|
4724f5eb2f
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 03fce45518 -s ours am: e0bb7a6d16 -s ours am: 9a81f424ae -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I58c4c9cae366e2d683d236a02382db668a9729ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:16:29 +00:00 |
|
Haijie Hong
|
21b075770e
|
Improve Bluetooth pairing dialog & contact sharing toggle
Before change: https://screenshot.googleplex.com/Agr29KTvgptbsag
After change: https://screenshot.googleplex.com/ArjiavkFAFiuCTR
Bug: 274521434
Test: RunSettingsRoboTests
Change-Id: Ib896b70bc219de128b733b75249bf80e3389f221
|
2023-08-08 13:15:38 +08:00 |
|
Eric Biggers
|
e7170062ac
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: e176ec56dc -s ours am: 7f7cd6c38b -s ours am: c1c1acfd67 -s ours am: 86ae3f9f7a -s ours am: d0a6da4f8a -s ours am: 791a64a380 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: Ibcce202513dd2f43c80207fcb8f944200165dd1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:15:13 +00:00 |
|
Automerger Merge Worker
|
3cb6ef1a6a
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 97da688143 -s ours am: 654b36564f -s ours" into udc-qpr-dev-plus-aosp am: d83aa5d781 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I489f0e00c2d99ae6eeb26f12d28e5cd6c524243e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:11:52 +00:00 |
|
Eric Biggers
|
71ae367906
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 355e257668 -s ours am: 419537da17 -s ours am: df35caa539 -s ours am: 97da688143 -s ours am: 654b36564f -s ours am: 5011c1a64c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: Ia53f46184659a6fbf3682ce971c845c8385bfffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:11:46 +00:00 |
|
Automerger Merge Worker
|
ef0812efe1
|
Merge changes from topic "am-7fd9b2ff33084bf2a8b3220c94124f2f" into udc-qpr-dev-plus-aosp am: 680254fe79 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: Id1b7a1ce3320215fb43b59067f21186a29b703b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:07:11 +00:00 |
|
Automerger Merge Worker
|
974d042a77
|
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours am: 3a7a9be734 -s ours" into udc-d1-dev-plus-aosp am: 2d4ca1db18 -s ours am: 80daabd077 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I2a91f2d7e8ea70d82b18a744dfc12ece42eb0525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:07:06 +00:00 |
|
Chaohui Wang
|
e9cf4bf65c
|
Merge "Convert DataUsageLib to Kotlin" into main
|
2023-08-08 05:05:01 +00:00 |
|
Eric Biggers
|
b22fadff5c
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: e176ec56dc -s ours am: 7f7cd6c38b -s ours am: c1c1acfd67 -s ours am: 8e234af041 -s ours am: 7989bc077b -s ours am: 10592e4261 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: Idc2a8f0070d384ca5b95061e222886219c9c3f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:02:40 +00:00 |
|
Eric Biggers
|
d01ae4c976
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I5403f06aa7d1d66b6950c72582dc3197102574d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 05:00:08 +00:00 |
|
Eric Biggers
|
c748718a68
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I5871794bf6b1523258eb2e873c1be1cde4fd798a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:59:45 +00:00 |
|
Eric Biggers
|
2b385e7da2
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I022ecb77d56f7a460d8a16887e2e406748951ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:59:20 +00:00 |
|
Eric Biggers
|
2f1ea667fa
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours am: a273ae9983 -s ours am: 6485d347ff -s ours am: 78829676e9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I00fe5ac58026e5e50e61178e7ee00712239165f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:59:05 +00:00 |
|
Eric Biggers
|
ea0207c908
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I2a3b27cf188c25acaf0f66ebcb8066d07bb3f6a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:58:51 +00:00 |
|
Eric Biggers
|
7ae93284fc
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Iec14dce103483456d7701233f493374b407eafaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:58:19 +00:00 |
|
Eric Biggers
|
32ba927770
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Iae1282ad8ab0f04f3b10f378067bc8fa3237f86a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:58:04 +00:00 |
|
Eric Biggers
|
4241da06f6
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours am: aa93927b87 -s ours am: 80ef1e0ff5 -s ours am: 7f97ac5ea7 -s ours am: 4643015447 -s ours am: 35e6c7b3dd -s ours am: d220b79a3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: Icf950b0ec4b92690df5c93e6cef95aeb54827122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:55:36 +00:00 |
|
Eric Biggers
|
d60572e3ed
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours am: bf4f533ea6 -s ours am: d890d1b428 -s ours am: 8b995bbc72 -s ours am: 936bf45faa -s ours am: 965d046088 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: Ia76c21ecb40e78b8ca7d02d569a08b2b119d09f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:54:40 +00:00 |
|
Kohsuke Yatoh
|
5e3cbc3fa6
|
Merge "Add @SearchIndexable to OneHandedSettings fragment" into main
|
2023-08-08 04:53:45 +00:00 |
|
Eric Biggers
|
57e52a7da8
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours am: 67c4be1e52 -s ours am: 57c5a92514 -s ours am: 3a9f8d7b32 -s ours am: 95a303ce6d -s ours am: 45e6fbbb81 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Ibd1c3d6db0c9353747acd4b9d0172668767009fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:53:44 +00:00 |
|