summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-22Snap for 8486043 from 8674c26a88b0249e53668c164409cf758640a91d to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-releaseAndroid Build Coastguard Worker
Change-Id: I9f66a5f4d57f2cba5db69194c6227e1980b5704d
2022-04-21[automerger skipped] Merge "[DO NOT MERGE] Fix winscope on R" am: 45fbf11f45 ↵Treehugger Robot
am: 89181a94c6 am: 7adadbf8c9 -s ours am: 8bd8b591c2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2071103 Change-Id: Ib991a7cbff0a1c87af72ed04c2e3d3eaf5039ad6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21[automerger skipped] [DO NOT MERGE] Fix winscope on R am: 8bcf476e55 am: ↵Nataniel Borges
65ccb4dc67 am: 62ad5eb549 -s ours am: de64e83b1d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2071103 Change-Id: Ib1d536b1b2fbd2954871edd0a4da5a27083987e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21[automerger skipped] Merge "[DO NOT MERGE] Fix winscope on R" am: 45fbf11f45 ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-vts-13.0_r3android-vts-13.0_r2android-cts-13.0_r3android-cts-13.0_r2android13-frc-odp-releaseandroid13-devTreehugger Robot
am: 89181a94c6 am: 7adadbf8c9 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2071103 Change-Id: Ifff2e1ae3cd3f48341bf6ca1c38fe18b2510ddbd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21[automerger skipped] [DO NOT MERGE] Fix winscope on R am: 8bcf476e55 am: ↵Nataniel Borges
65ccb4dc67 am: 62ad5eb549 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2071103 Change-Id: Ia38334cbe1fc7add8bac9d1f8cae3f9280d0046f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21Merge "[DO NOT MERGE] Fix winscope on R" am: 45fbf11f45 am: 89181a94c6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2071103 Change-Id: I7fe9f372139ac57db43edaf2afa5372a647bb30a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21[DO NOT MERGE] Fix winscope on R am: 8bcf476e55 am: 65ccb4dc67Nataniel Borges
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2071103 Change-Id: Iba3b510ea49f1f0a735b3331c7061117be759f4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21Merge "[DO NOT MERGE] Fix winscope on R" am: 45fbf11f45Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2071103 Change-Id: Ib1550a5b6426ff33c7c68f7b4dca3e6168f5efa3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21[DO NOT MERGE] Fix winscope on R am: 8bcf476e55Nataniel Borges
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2071103 Change-Id: I237c9743f8eb710d526ac1a1b5c6633e6a995c8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21Merge "[DO NOT MERGE] Fix winscope on R"android-tv-13.0.0_r0.2android-t-beta-3_r0.4Treehugger Robot
2022-04-21[DO NOT MERGE] Fix winscope on RNataniel Borges
Winscope on R needed to be rebuilt to work with the latest proto changes Fixes: 196260922 Test: open winscope and collect a trace Change-Id: I8931320dacad38c55a2d93661dd4efe3a3e61f1a
2022-04-21Snap for 8479981 from c883175b855009d861d344b03a30e0d38f8605d0 to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: I95d3367f8691dfad62db6591a7cdcdbbd54a225d
2022-04-20Merge "Update ddmlib prebuilt on 2022-04-20 02:04:51.120735" am: 570fb179e7 ↵Treehugger Robot
am: 675de03651 am: c40a27f7b2 am: 5cebac5582 Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2068322 Change-Id: Ia8a0fc9aa8023a86d33add4f5b2a9c4277ca0607 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20Merge "Update ddmlib prebuilt on 2022-04-20 02:04:51.120735" am: 570fb179e7 ↵Treehugger Robot
am: 675de03651 am: c40a27f7b2 Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2068322 Change-Id: I2bd3ae2d1c3946610c442bf684ac6a3518502861 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20Merge "Update ddmlib prebuilt on 2022-04-20 02:04:51.120735" am: 570fb179e7 ↵Treehugger Robot
am: 675de03651 Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2068322 Change-Id: I79ff6332ba6dad6a6f8ac7927f6c36e5a74c0d63 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20Merge "Update ddmlib prebuilt on 2022-04-20 02:04:51.120735" am: 570fb179e7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2068322 Change-Id: I47df3a01af3256475d1b7779c5a33692f8556b64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20Merge "Update ddmlib prebuilt on 2022-04-20 02:04:51.120735"Treehugger Robot
2022-04-20Update ddmlib prebuilt on 2022-04-20 02:04:51.120735ddmlib prebuilt drop
ddmlib-prebuilt.jar Built here: ab/8476652 The change is generated with prebuilt drop tool. Bug: 183394411 Change-Id: Ifb62f830bd5590ae4f9e00abbad3af549674dab7
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: cc34ce9d75 -s ours am: a3d95864db -s ours am: e6fbcc590c -s ours am skip reason: Merged-In I8e9abc54863afb221a4367e1766eba82c2aef55f with SHA-1 56cdb7c9ab is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/17805476 Change-Id: I81b2e4fa234fd2f57f747cd90fe9ac77fe172e89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: cc34ce9d75 -s ours am: a3d95864db -s ours am skip reason: Merged-In I8e9abc54863afb221a4367e1766eba82c2aef55f with SHA-1 56cdb7c9ab is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/17805476 Change-Id: I47c0e76b732b6edb1879ddfe10b912fb2474388c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: cc34ce9d75 -s ours am skip reason: Merged-In I8e9abc54863afb221a4367e1766eba82c2aef55f with SHA-1 56cdb7c9ab is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/17805476 Change-Id: I8e0fb53dfe0d5e6645c8b18a39b5fb3e8dec600c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047Xin Li
Bug: 226662282 Merged-In: I8e9abc54863afb221a4367e1766eba82c2aef55f Change-Id: Ia187256194dc54db8cd37fccb2d95b805bc81fe2
2022-04-16Snap for 8462961 from da1f500d84b2fb13d007ed48cbf5bfa1ded7ee51 to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: I30b16e769b8bc5a902e9801c52f4eb1eeccef3d6
2022-04-15Merge "Update ddmlib prebuilt on 2022-04-13 02:05:20.774627" am: 53d4d4f7cd ↵Treehugger Robot
am: df14df58cc am: 2de4ceec1c am: 47ad163419 Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2063411 Change-Id: I19b5e9131a3536ab6206432469439632a4f46d28 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15Merge "Update ddmlib prebuilt on 2022-04-13 02:05:20.774627" am: 53d4d4f7cd ↵Treehugger Robot
am: df14df58cc am: 2de4ceec1c Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2063411 Change-Id: Ie9a70aa1e87f3fa9f535e841f2aa97737740ef64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15Merge "Update ddmlib prebuilt on 2022-04-13 02:05:20.774627" am: 53d4d4f7cd ↵Treehugger Robot
am: df14df58cc Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2063411 Change-Id: If99827f191cc63e6a85d9b02f3223ed630c387bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15Merge "Update ddmlib prebuilt on 2022-04-13 02:05:20.774627" am: 53d4d4f7cdTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2063411 Change-Id: I6a57657e66e37ba75ef2d84353349e0d42fadcff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15Merge "Update ddmlib prebuilt on 2022-04-13 02:05:20.774627"Treehugger Robot
2022-04-13Update ddmlib prebuilt on 2022-04-13 02:05:20.774627ddmlib prebuilt drop
ddmlib-prebuilt.jar Built here: ab/8446946 The change is generated with prebuilt drop tool. Bug: 183394411 Change-Id: Ibeb915520041d90d72af403560d7222ea5ea2f18
2022-04-05Snap for 8404802 from 2dcd92cd757c3f1a1fcffdb31f764a47fdb1b55a to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: I3255119d3afb4b850714061b43aa0f88ba66b91f
2022-04-03Snap for 8401211 from 1537eb1cd8d89c96e7564c72150cb3f64563acf4 to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: Ifccbb9c384e46c7e678850d948504150e89f2c1d
2022-04-03[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-b40b36485948405484f981b5fc7ceaca" am: 9b98412ce0 -s ours am: 4a3e73d8c4 -s ours am: 0c2f7d2205 -s ours am: 1537eb1cd8 -s ours am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 3a419b37e2 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052196 Change-Id: I13fd17360ff4578ea54b5bc855f8a3e2009eae39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge "Mark ab/8389834 as merged" into ↵Treehugger Robot
android12L-tests-dev am: e4c92b76dc -s ours am: 18f26c9806 -s ours am: 14664acdec -s ours am: 169a77ea77 -s ours am: d6bddb95d8 -s ours am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 3a419b37e2 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052196 Change-Id: I003b050af2d8bdadf2939299aac6a211fcedaddb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-b40b36485948405484f981b5fc7ceaca" am: 9b98412ce0 -s ours am: 4a3e73d8c4 -s ours am: 0c2f7d2205 -s ours am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 3a419b37e2 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052196 Change-Id: I50162031cc2d1b6d1b122aad51e26627a9848ee4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge "Mark ab/8389834 as merged" into ↵Treehugger Robot
android12L-tests-dev am: e4c92b76dc -s ours am: 18f26c9806 -s ours am: 14664acdec -s ours am: 169a77ea77 -s ours am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 3a419b37e2 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052196 Change-Id: Ic74312701cce7e54b574e905e9c0e9baf63a2f18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-b40b36485948405484f981b5fc7ceaca" am: 9b98412ce0 -s ours am: 4a3e73d8c4 -s ours am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 3a419b37e2 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052196 Change-Id: I5f0025130e97ef704619ff6c8f7795c7dcef1c84 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge "Mark ab/8389834 as merged" into ↵Treehugger Robot
android12L-tests-dev am: e4c92b76dc -s ours am: 18f26c9806 -s ours am: 14664acdec -s ours am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 3a419b37e2 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052196 Change-Id: Id2b6771ca58b9b9d10a0017d4cf30618a79f14d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03Merge changes from topic "am-b40b36485948405484f981b5fc7ceaca" am: ↵Automerger Merge Worker
9b98412ce0 -s ours am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 3a419b37e2 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052196 Change-Id: I1b82498fada5d40d0525e90549cbb0b3d8337752 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge "Mark ab/8389834 as merged" into ↵Treehugger Robot
android12L-tests-dev am: e4c92b76dc -s ours am: 18f26c9806 -s ours am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 3a419b37e2 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052196 Change-Id: I8b62e1452f72ddcfbfb7c827d5fbe22168a0258d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03Merge changes from topic "am-b40b36485948405484f981b5fc7ceaca"android-t-beta-2_r0.4android-gs-raviole-5.10-t-beta-2Automerger Merge Worker
* changes: [automerger skipped] Merge "Mark ab/8389834 as merged" into android12L-tests-dev am: e4c92b76dc -s ours [automerger skipped] Mark ab/8389834 as merged am: e53691f83e -s ours
2022-04-03[automerger skipped] Merge "Mark ab/8389834 as merged" into ↵Treehugger Robot
android12L-tests-dev am: e4c92b76dc -s ours am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 3a419b37e2 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052196 Change-Id: I3c10c22ac69280afec0372663c9f89edf0299fe1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Mark ab/8389834 as merged am: e53691f83e -s oursXin Li
am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 3a419b37e2 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052196 Change-Id: I6d6485b047ef5eed225166dd54479f65dcb93cfd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03Merge "Mark ab/8389834 as merged" into android12L-tests-devandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android12L-tests-releaseandroid12L-tests-devTreehugger Robot
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: cc0cb20308 -s ours ↵Xin Li
am: 358d8a028a -s ours am: 0a0ca17072 -s ours am skip reason: Merged-In Ifcd9c80e1544d0805d030046da83675d952e45c3 with SHA-1 036281b592 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/17544601 Change-Id: I16b0b12d03438b9347cd2e6e4a11792794251c55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: cc0cb20308 -s ours ↵Xin Li
am: 358d8a028a -s ours am skip reason: Merged-In Ifcd9c80e1544d0805d030046da83675d952e45c3 with SHA-1 036281b592 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/17544601 Change-Id: Ie73012132801dc16048afec2777a4cff8dae2e9d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: cc0cb20308 -s oursXin Li
am skip reason: Merged-In Ifcd9c80e1544d0805d030046da83675d952e45c3 with SHA-1 036281b592 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/17544601 Change-Id: I5c0ef34085bbdfe81c25591e73d338d8df090dca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: Ifcd9c80e1544d0805d030046da83675d952e45c3 Change-Id: Ic437185a7006922fda1dd8d75bc6fe6f345f2bc0
2022-04-01Mark ab/8389834 as mergedXin Li
Bug: 188847863 Merged-In: Idde9c2cee27dd901466cb14ddc1c70a5106b8584 Change-Id: Ibad386dd2fcc5712ed8808f662c1206b4db9b52f
2022-04-01Snap for 8392861 from bf658bc0c9ec95aa1fde94beeadfb6b5eb77a740 to tm-d1-releaseAndroid Build Coastguard Worker
Change-Id: Ie9dd820c37d8c69d4152866f94285c6e693f5274
2022-04-01Merge "Non-module targets." am: 143ab4e539 am: d46fd39896 am: 035141cadf am: ↵Treehugger Robot
bf658bc0c9 Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052095 Change-Id: I735572eb10b1026ca38dfcd6cd3f33f82f339b6b 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-24 03:01:57 +0000