aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-27Snap for 11012804 from b319cfe2b03677a01fba6336b7c3b3f56ce006a3 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I54b5e3e4a9d4537f3ad9082f5e00c16a7517a923
2023-10-26Merge "[automerger skipped] Merge android14-tests-dev am: 5e3a704158 -s ours ↵HEADmastermainAutomerger Merge Worker
am: c407e64eef -s ours" into udc-qpr-dev-plus-aosp am: 1444f747a8 -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 6149d26691 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2780879 Change-Id: I853304fadd843d4ae00c0a260e51cb4d4ba5c9a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge android14-tests-dev am: 5e3a704158 -s ours am: ↵Xin Li
c407e64eef -s ours am: 1a5fae216d -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2780879 Change-Id: I1862d1d9330cd973d1ba5269181ed46534a46569 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge android14-tests-dev am: 5e3a704158 -s ours am: ↵Xin Li
ab27b33daf -s ours am: 43980e850f -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2780879 Change-Id: Iea06939d1ee73b1395713b4e4c04040f2ffc8249 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26Merge "[automerger skipped] Merge android14-tests-dev am: 5e3a704158 -s ours ↵Automerger Merge Worker
am: c407e64eef -s ours" into udc-qpr-dev-plus-aosp
2023-10-26[automerger skipped] Merge android14-tests-dev am: 5e3a704158 -s ours am: ↵Xin Li
c407e64eef -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2780879 Change-Id: Ie4d5dd46e8f34a487b7b5396fbe92b60479809d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge android14-tests-dev am: 5e3a704158 -s ours am: ↵Xin Li
ab27b33daf -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2780879 Change-Id: I7e9f4a3bf9a78b59dacde0a2245ca3f2d8eb5e27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge android14-tests-dev am: 5e3a704158 -s oursXin Li
am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2780879 Change-Id: I79d6505ca396f93f56a86a01c81a70ae4ea420ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge android14-tests-dev am: 5e3a704158 -s oursXin Li
am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2780879 Change-Id: I625098302c5eb9e5817503a85defb8c1a159b87a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10Merge android14-tests-devXin Li
Bug: 263910020 Merged-In: I52ebfa22d61ba8fdf2af481d034a07d37429dd43 Change-Id: I050c494d30fbe6fa3702dadd6b113de7f8cc73af
2023-10-07Snap for 10917888 from 597fdab110cef5402f500cf1ee86b7653f03301d to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ic0c496a92dd9b89a70c6cd25f8e32f50b0cebd46
2023-10-07Clean up obsolete aliases for Truth. am: 3575d1e55a am: e0169e0fa9 am: ↵Krzysztof Kosiński
a866f973ff am: 7f7b06f548 am: 1f7eb1aeed Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2776856 Change-Id: Ifa4cff423e4b8c57a68485fba7f9ed78a796175c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: 3575d1e55a am: e0169e0fa9 am: ↵Krzysztof Kosiński
a866f973ff am: 7f7b06f548 Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2776856 Change-Id: Ia6696586bbdc5ef0b5c23073f54f128731e804d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: 3575d1e55a am: e0169e0fa9 am: ↵Krzysztof Kosiński
a866f973ff Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2776856 Change-Id: I8d93fdc4433c6e8d5a5234ceedf8e09381e88222 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: 3575d1e55a am: e0169e0fa9Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2776856 Change-Id: I88c8f8dcfa79ad12c9b908bfb072021c07a9922b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: 3575d1e55aKrzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2776856 Change-Id: Ie02b8878bfb4205ee3b9385928e0c93b2519573c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth.Krzysztof Kosiński
Bug: 255714762 Test: presubmit Change-Id: Ieb6e68bee1a9a60c2978a3b9fdac4f8bd9997e4b
2023-10-07[automerger skipped] Merge Android 14 am: b82ab9e803 -s ours am: 63b5db0ade ↵Xin Li
-s ours am: 19e66c3e25 -s ours am: 40ef686930 -s ours am: 4caefd6766 -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2776739 Change-Id: I6afb6db1f4f1c5c4af93908ac05a626b98db53ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: b82ab9e803 -s ours am: 63b5db0ade ↵Xin Li
-s ours am: 19e66c3e25 -s ours am: 40ef686930 -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2776739 Change-Id: Id1d1a0b96db3df067eb822ac6cf7dec2b3d0ed26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: b82ab9e803 -s ours am: 63b5db0ade ↵Xin Li
-s ours am: 19e66c3e25 -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2776739 Change-Id: I90902fc7b4cf2f726cf97e38105a217b65b894f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: b82ab9e803 -s ours am: 63b5db0ade ↵Xin Li
-s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2776739 Change-Id: I4a8743346d2064d8f8c96a2086865d68cce2a185 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: b82ab9e803 -s oursXin Li
am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2776739 Change-Id: I62a4fa64cd4da29db7ebd8de3be3c4932e3a536e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I52ebfa22d61ba8fdf2af481d034a07d37429dd43 Change-Id: Ie3be18dbfafff720bcc54255c79f0d1766ff04ec
2023-09-21Snap for 10843824 from fe54aea958b9f596326262a8dbc4f6f3551a3dfa to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I4dcbe91fcfd013854c43ee9a41c018823e4bd4d7
2023-08-29[automerger skipped] modify the concurrentmodificationexception in the ↵ellen,yang
senfers in CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 am: 3c82ea5b75 am: 14baacfa7d -s ours am: f5ccd8b087 -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 6149d26691 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: Ic27105fc6d4f1c25b43f99a58603a7c648261e1f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] modify the concurrentmodificationexception in the ↵ellen,yang
senfers in CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 am: 3c82ea5b75 -s ours am: 962656f154 -s ours am: 6f0d253b57 -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 6149d26691 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: I51e19a63f5cecaf2ff79e05e581f7892fc9b2f06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] modify the concurrentmodificationexception in the ↵ellen,yang
senfers in CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 -s ours am: 65a34e7dda -s ours am: b63fef7ace -s ours am: 762e32774a -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: I0fce9ecc96fe2922801cc2472c1d3198c6eb5150 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge "Merge Android U (ab/10368041)" into ↵Xin Li
aosp-main-future am: 1ce79dfbac -s ours am: 55691fa23d -s ours am: 7a86bcde10 -s ours am: ca16e07008 -s ours am skip reason: Merged-In I6152cf22459929a552103d3ba274c6819415a388 with SHA-1 5bb6545715 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24181973 Change-Id: Iad0f7e0b2753dc5827247a9c40101ff065ab5136 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: af97732a87 -s ours ↵Xin Li
am: 83122505e0 -s ours am: 328eca498e -s ours am: 63e690d1c7 -s ours am skip reason: Merged-In I6152cf22459929a552103d3ba274c6819415a388 with SHA-1 5bb6545715 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24181973 Change-Id: I3b1cf81028972fd31a70677907d3d927e1eec077 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] modify the concurrentmodificationexception in the ↵ellen,yang
senfers in CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 am: 3c82ea5b75 am: 14baacfa7d -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 6149d26691 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: Ib043245e0d80f305e3f9710614dcd01d42fb4f6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] modify the concurrentmodificationexception in the ↵ellen,yang
senfers in CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 am: 3c82ea5b75 -s ours am: 962656f154 -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 6149d26691 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: Ib6467f9f845547c1dc69e414ecfde114508108de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] modify the concurrentmodificationexception in the ↵ellen,yang
senfers in CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 am: 59fdce4f2c -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: Ia93bdd2d16b3bb0d69450fc01d4163656521aeee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] modify the concurrentmodificationexception in the ↵ellen,yang
senfers in CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 am: 3c82ea5b75 -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 6149d26691 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: I0cc220d8a621959fd2ac5bd5961ff7c2974d8ff3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29modify the concurrentmodificationexception in the senfers in ↵ellen,yang
CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 am: 3c82ea5b75 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: Ie389554f752e4b8a087999882f26f238b35fe675 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] modify the concurrentmodificationexception in the ↵ellen,yang
senfers in CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 -s ours am: 65a34e7dda -s ours am: b63fef7ace -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: I3c2673555adee9b51cd07f7e3bbdc2ae99608a62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] modify the concurrentmodificationexception in the ↵ellen,yang
senfers in CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 -s ours am: 65a34e7dda -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: If60ff8b15182cbdcf747ac5a6147514409aac7d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29modify the concurrentmodificationexception in the senfers in ↵ellen,yang
CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: I47b0368c78a8fe3dafa419973e22cfd7ed30a4a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29modify the concurrentmodificationexception in the senfers in ↵ellen,yang
CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: Ib3e26d31082ed18abacf549fe887903a38f1b96d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] modify the concurrentmodificationexception in the ↵ellen,yang
senfers in CrossprofileSenders.java am: 6149d26691 am: 18fc849bf3 -s ours am skip reason: Merged-In I52ebfa22d61ba8fdf2af481d034a07d37429dd43 with SHA-1 2067f2a646 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: I48583fa720542df36082610693fe327ed4866c31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29modify the concurrentmodificationexception in the senfers in ↵ellen,yang
CrossprofileSenders.java am: 6149d26691 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24537586 Change-Id: Ie3cb84447905913a6b2d200eec537a9a6f5583eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge "Merge Android U (ab/10368041)" into ↵Xin Li
aosp-main-future am: 1ce79dfbac -s ours am: 55691fa23d -s ours am: 7a86bcde10 -s ours am skip reason: Merged-In I6152cf22459929a552103d3ba274c6819415a388 with SHA-1 5bb6545715 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24181973 Change-Id: Iac1f681b67be170781736fa8e40109fe25a0ef09 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: af97732a87 -s ours ↵Xin Li
am: 83122505e0 -s ours am: 328eca498e -s ours am skip reason: Merged-In I6152cf22459929a552103d3ba274c6819415a388 with SHA-1 5bb6545715 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24181973 Change-Id: I899616613d1b209666a5b58b079b11499f054794 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge "Merge Android U (ab/10368041)" into ↵Xin Li
aosp-main-future am: 1ce79dfbac -s ours am: 55691fa23d -s ours am skip reason: Merged-In I6152cf22459929a552103d3ba274c6819415a388 with SHA-1 5bb6545715 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24181973 Change-Id: I912ae0bd3ee4996ddd5636776d7a222839555db4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: af97732a87 -s ours ↵Xin Li
am: 83122505e0 -s ours am skip reason: Merged-In I6152cf22459929a552103d3ba274c6819415a388 with SHA-1 5bb6545715 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24181973 Change-Id: I6c9f0a1e7704a9df9ae78fdc1de123aa860c3cc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge "Merge Android U (ab/10368041)" into ↵Xin Li
aosp-main-future am: 1ce79dfbac -s ours am skip reason: Merged-In I6152cf22459929a552103d3ba274c6819415a388 with SHA-1 5bb6545715 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24181973 Change-Id: I1d811d8efae7fc30da8c0b7de334f07c768c3472 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: af97732a87 -s oursXin Li
am skip reason: Merged-In I6152cf22459929a552103d3ba274c6819415a388 with SHA-1 5bb6545715 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/connectedappssdk/+/24181973 Change-Id: If08465cefb460b03fc30e425b4abb3f47d373329 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28Merge "Merge Android U (ab/10368041)" into aosp-main-futuretmp_amf_298295554Xin Li
2023-08-24modify the concurrentmodificationexception in the senfers in ↵ellen,yang
CrossprofileSenders.java am: 2067f2a646 am: 6fc6d5a28f am: 0936338eb7 am: 4a1319f75b am: bdbc6425d3 Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2714934 Change-Id: I4eda4cbc57766f7b476d6f49bd895f3498568e11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24modify the concurrentmodificationexception in the senfers in ↵ellen,yang
CrossprofileSenders.java am: 2067f2a646 am: 6fc6d5a28f am: 0936338eb7 am: 4a1319f75b Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2714934 Change-Id: Ibc650cf07922a651040af8c8ad3de911bdf90b8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24modify the concurrentmodificationexception in the senfers in ↵ellen,yang
CrossprofileSenders.java am: 2067f2a646 am: 6fc6d5a28f am: 0936338eb7 Original change: https://android-review.googlesource.com/c/platform/external/connectedappssdk/+/2714934 Change-Id: Ibbaef328e2c685a0357137b4eda420a84f0c2297 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 14:49:41 +0000