Eric Biggers
|
172991be6a
|
[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: 61785ffddd -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: I0185b70bb445911e360d57f5b33fcc60ab6dd920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:15:48 +00:00 |
|
Automerger Merge Worker
|
5a94df0299
|
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 am: 1eb56a1e47 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: Ib7d0c0944474f076c7c3edb4c1d02b16c2b318a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:12:00 +00:00 |
|
Eric Biggers
|
37816dee32
|
[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: 5621f2a1fd -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: I57af4091f5fca015570a0fd2f4cd6d3003748c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:11:55 +00:00 |
|
Eric Biggers
|
f351d2f2d1
|
[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: a837b676c9 -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: Ic95867b0a99e719000ce514d0a001974b75495e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:09:07 +00:00 |
|
Automerger Merge Worker
|
8bc7f7ea86
|
Merge changes from topic "am-26c28ebb54a241eea293a13ad6ca0543" into udc-qpr-dev-plus-aosp
* changes:
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 am: 2df94229d9 -s ours
[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: c37e45ba7e -s ours
|
2023-08-08 06:06:22 +00:00 |
|
Automerger Merge Worker
|
8b90c3dcd2
|
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 am: 2df94229d9 -s ours
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: I1243f3a97096eb86ab7c5512a155e677f4d0f88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:05:35 +00:00 |
|
Eric Biggers
|
6dd275536a
|
[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: c37e45ba7e -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: Id8fc0ac3eadd02e02a7b430c7c0530106ee96506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:05:30 +00:00 |
|
Eric Biggers
|
2c8967d76c
|
[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: 9c22ad2b3c -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: Ib44433ef43efd11a13a75eca1f3a9bf43a711e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:05:00 +00:00 |
|
Automerger Merge Worker
|
384191b983
|
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 am: cdf5989035 -s ours" into udc-qpr-dev-plus-aosp
|
2023-08-08 06:04:22 +00:00 |
|
Automerger Merge Worker
|
17e17a55c5
|
Merge changes from topic "am-d3c7160b969d4753a0d372fc1ebd01d5" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 2e92835b46 -s ours am: a2712b2b5e -s ours
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: 50261c4b0a -s ours am: 8861dc9544 -s ours
|
2023-08-08 06:03:51 +00:00 |
|
Eric Biggers
|
36ea4a7580
|
[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: cdf5989035 -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: I1b79355d37cd4a6d9093abfa485e30b635529d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:03:42 +00:00 |
|
Eric Biggers
|
32991b881f
|
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 2e92835b46 -s ours am: a2712b2b5e -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: I65a21b45f465fc5ef5b014e2d5a942a6555e909a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:03:05 +00:00 |
|
Eric Biggers
|
3d7a67c02d
|
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: 50261c4b0a -s ours am: 8861dc9544 -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: I47e377345de0abdcb18b0af7cb235a8d2b5ebd28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:03:03 +00:00 |
|
Eric Biggers
|
d20b6385f0
|
[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: ae39fa7e2a -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: Ief253e40a4ca68653a6c0b05c305a29d44453fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:02:56 +00:00 |
|
Automerger Merge Worker
|
93e778592b
|
Merge changes from topic "am-cd5a3cea6b294c4983a26f694f5a5c34" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 5a04afe7dd -s ours am: b87c5aa1a9 -s ours
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8daeb -s ours am: e10ad67f99 -s ours am: 87bbc90fbc -s ours
|
2023-08-08 06:02:22 +00:00 |
|
Eric Biggers
|
5892ffe6c5
|
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -s ours am: 5a04afe7dd -s ours am: b87c5aa1a9 -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: I391fdae7c9f936f82352ae22d52f0d5d3ae03ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 06:01:44 +00:00 |
|
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
|
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 |
|
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 |
|
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
|
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
|
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
|
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
|
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 |
|
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 |
|
Eric Biggers
|
9a81f424ae
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I7ceca59d404065d1aff4c8760c5b9aafe4664536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:39:27 +00:00 |
|
Eric Biggers
|
d220b79a3f
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: Ifec3990978057829e349649f96e93d044183ea93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:39:08 +00:00 |
|
Eric Biggers
|
791a64a380
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: I438211982be0c355fa1da105434e491b2e1c0c2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:38:59 +00:00 |
|
Automerger Merge Worker
|
d83aa5d781
|
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
|
2023-08-08 04:38:48 +00:00 |
|
Automerger Merge Worker
|
680254fe79
|
Merge changes from topic "am-7fd9b2ff33084bf2a8b3220c94124f2f" into udc-qpr-dev-plus-aosp
* changes:
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
[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 am: b1ea26ca9a -s ours
|
2023-08-08 04:38:16 +00:00 |
|
Eric Biggers
|
965d046088
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: Ie551a7a2186c17a12680a90eba3bd5b47fb743c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:38:06 +00:00 |
|
Eric Biggers
|
5011c1a64c
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I532e13919ab5863bc8ab4ce171a536018ebf2047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:38:03 +00:00 |
|
Automerger Merge Worker
|
80daabd077
|
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 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: I645f155d6c0e411cbb08fa77bfe6237c2a2a9730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:37:54 +00:00 |
|
Eric Biggers
|
2ebebf4f9e
|
[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 am: b1ea26ca9a -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: I8f89eb907bdfa947725ee34748add782d94c2c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:37:52 +00:00 |
|
Eric Biggers
|
10592e4261
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: I726a09e0fb90fb24773556840d266e5718eab382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:37:20 +00:00 |
|
Eric Biggers
|
45e6fbbb81
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Ifed87fa6fe5e873ced826ac403159cd2f83b429a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:37:06 +00:00 |
|
Eric Biggers
|
2e92835b46
|
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf68 -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: I073072f7456fbbc1b53bde1327e4e8414f7b1ed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-08-08 04:36:06 +00:00 |
|