aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-21Snap for 7160059 from c4a6e21b807a953e6b8b0c380445838fc0049462 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-releaseandroid-build-team Robot
Change-Id: I0d102d5896eb16420ec020ac4279708cbe45070e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0bd776e3c8 -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: ee7bd22dbc -s ours am skip reason: Change-Id I143414d9e0010360f410d4ce416dea47a18081e6 with SHA-1 468689f430 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e0c61fd263e038d6ce70f40c68b6d766a44e7b9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0bd776e3c8 -s oursXin Li
am skip reason: Change-Id I143414d9e0010360f410d4ce416dea47a18081e6 with SHA-1 468689f430 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3187ddbc71f3bf3f1f73840529bc66d26246865e
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I143414d9e0010360f410d4ce416dea47a18081e6 Change-Id: I8ae4ae9b2f05ba0bcf43f2c66395e099005e1259
2021-02-17Snap for 7149879 from 46d08471877caf5e3df8277e6753e47467d7bd04 to sc-d1-releaseandroid-build-team Robot
Change-Id: I2e45126794be50b316eedc4a4a229c93ee4e3da6
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/smali" am: 2acd19fe19 am: ↵Bob Badour
a4c146a439 am: 91678a6fa8 Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1588225 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ida43372fa531a84dea9e3943fab4b4d0436a1099
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/smali" am: 2acd19fe19 am: ↵Bob Badour
a4c146a439 Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1588225 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I107c5038a25e97b8c0fbbf7ed27a87a8f413be6c
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/smali" am: 2acd19fe19Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1588225 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I21d0d351e6db7d1db072075692b16d06223d2baa
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/smali"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/smaliBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: Android.bp dexlib2/Android.bp Added SPDX-license-identifier-BSD to: baksmali/Android.bp deodexerant/Android.bp smali/Android.bp util/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ib54545fe7932e452016833d969b0d42d6b93f1f3
2020-11-26Snap for 6996014 from 2c0275324664dd849c4fcd315dfba87d2c5e989e to sc-d1-releaseandroid-build-team Robot
Change-Id: I9e48d3bf568aefbebc30cef123d67a2038626c6f
2020-11-25Mark ab/6881855 as merged am: 05d6038bcf am: 468689f430Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/13112908 Change-Id: I0be1ed47728b947b982493128db29c9aefbb96b1
2020-11-25Mark ab/6881855 as merged am: 05d6038bcfXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/13112908 Change-Id: I143414d9e0010360f410d4ce416dea47a18081e6
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I70a4e0e64d15b31ac367bba4678891a73db9daca
2020-10-11Snap for 6897674 from fc8b8a8b5a3969cf703da8a7e127117422d6d9e7 to sc-d1-releaseandroid-build-team Robot
Change-Id: I5a235b04b629cd6603985d769dc15c32aa91936b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6f6c231fdf -s ours am: ↵Xin Li
c4f7b168ba -s ours am: a42c1e407d -s ours am: 6783645d94 -s ours am skip reason: Change-Id I2547534d94a0d290f511604f190413ac9c9ba228 with SHA-1 e900a9011c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12795754 Change-Id: Iebc432057ab52ecb5ce6883be1d91db62f7516a6
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6f6c231fdf -s ours am: ↵Xin Li
c4f7b168ba -s ours am: a42c1e407d -s ours am skip reason: Change-Id I2547534d94a0d290f511604f190413ac9c9ba228 with SHA-1 e900a9011c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12795754 Change-Id: Iae3663671dcb34e9c8d20690289e2e88d6a99e51
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6f6c231fdf -s ours am: ↵Xin Li
c4f7b168ba -s ours am skip reason: Change-Id I2547534d94a0d290f511604f190413ac9c9ba228 with SHA-1 e900a9011c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12795754 Change-Id: I34c46d9649f5030a4af0f22b08f74af8ce046fbf
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 6f6c231fdf -s oursXin Li
am skip reason: Change-Id I2547534d94a0d290f511604f190413ac9c9ba228 with SHA-1 e900a9011c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12795754 Change-Id: Ib291b9f9e476480ee37c4f1ebe5ea68ef461d0a5
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I2547534d94a0d290f511604f190413ac9c9ba228 Change-Id: I639290e8ee2369dabf46e2f74341face63cc9d48
2020-09-13Snap for 6830825 from ea8a405d429520aa9ab5913e52744024e7dfece4 to sc-d1-releaseandroid-build-team Robot
Change-Id: I7db64a9d35323aac3146cdda6ac7560eb7762ee0
2020-09-11[automerger skipped] Merge "Merge Android R" am: 33984eb6fa -s ours am: ↵Xin Li
678ba27ac5 -s ours am: bc0c49f047 -s ours am: 7dec9f153b -s ours am: 2e4bc6f1ce -s ours am: a148ea2303 -s ours am skip reason: Change-Id I31dca54f3abc68de303bdfed6727112688e2f228 with SHA-1 9f6624c411 is in history Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1422362 Change-Id: Ibeee710a601e0ee0c6b67f6aa409b1ad6869e76c
2020-09-11[automerger skipped] Merge "Merge Android R" am: 33984eb6fa -s ours am: ↵Xin Li
678ba27ac5 -s ours am: bc0c49f047 -s ours am: 7dec9f153b -s ours am: 2e4bc6f1ce -s ours am skip reason: Change-Id I31dca54f3abc68de303bdfed6727112688e2f228 with SHA-1 9f6624c411 is in history Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1422362 Change-Id: Ibd66bbba780a25d558fc6a87ab6a450d5e73ecdb
2020-09-11[automerger skipped] Merge "Merge Android R" am: 33984eb6fa -s ours am: ↵Xin Li
678ba27ac5 -s ours am: bc0c49f047 -s ours am: 7dec9f153b -s ours am skip reason: Change-Id I31dca54f3abc68de303bdfed6727112688e2f228 with SHA-1 9f6624c411 is in history Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1422362 Change-Id: I4e3e3c71503aa5a8b02b246bbfb20fbd2ec7d06d
2020-09-11[automerger skipped] Merge "Merge Android R" am: 33984eb6fa -s ours am: ↵Xin Li
678ba27ac5 -s ours am: bc0c49f047 -s ours am skip reason: Change-Id I31dca54f3abc68de303bdfed6727112688e2f228 with SHA-1 9f6624c411 is in history Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1422362 Change-Id: Ia1911609ce5cebd3c759243f179ea0473860349a
2020-09-11[automerger skipped] Merge "Merge Android R" am: 33984eb6fa -s ours am: ↵Xin Li
678ba27ac5 -s ours am skip reason: Change-Id I31dca54f3abc68de303bdfed6727112688e2f228 with SHA-1 9f6624c411 is in history Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1422362 Change-Id: I5bcecf856bc4ad1ee0adb1b627c276e96ee1dbb3
2020-09-11[automerger skipped] Merge "Merge Android R" am: 33984eb6fa -s oursXin Li
am skip reason: Change-Id I31dca54f3abc68de303bdfed6727112688e2f228 with SHA-1 9f6624c411 is in history Original change: https://android-review.googlesource.com/c/platform/external/smali/+/1422362 Change-Id: I99df055568154aa0c70555a63f743fdeec4cb478
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I31dca54f3abc68de303bdfed6727112688e2f228 Change-Id: I1f7bc67e665d4c4c13f1db07e409da444ebb3e70
2020-09-03Snap for 6810044 from 162516aef7f22d30687b82a4bfc73fa6e45e5ac7 to sc-d1-releaseandroid-build-team Robot
Change-Id: I4aed283413a6d8c5340f11c3597c395f9f90b4bc
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9f6624c411 -s ours am: eee6b33ac4 -s ours am: 212102a6eb -s ours am: a09f483f30 -s ours am: b16643a33d -s ours am skip reason: Change-Id Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 with SHA-1 b6add02184 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12470076 Change-Id: I3e0919ded36e6f86ddff91b5af7e0e8ac8726ca1
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9f6624c411 -s ours am: eee6b33ac4 -s ours am: 212102a6eb -s ours am: a09f483f30 -s ours am skip reason: Change-Id Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 with SHA-1 b6add02184 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12470076 Change-Id: Id5687918f2d40b2bea55ccaf50b291577443c268
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9f6624c411 -s ours am: eee6b33ac4 -s ours am: 212102a6eb -s ours am skip reason: Change-Id Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 with SHA-1 b6add02184 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12470076 Change-Id: I02ea76546c2cb86560647c38006aa7ccb20e6840
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9f6624c411 -s ours am: eee6b33ac4 -s ours am skip reason: Change-Id Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 with SHA-1 b6add02184 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12470076 Change-Id: I981778f30a1ac1cbe099475002bf9dd13ddf3328
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 9f6624c411 -s ours am skip reason: Change-Id Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 with SHA-1 b6add02184 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/smali/+/12470076 Change-Id: I02fbdb76ffe0a9a69a9920d3b318e2596a9a72ab
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 Change-Id: I31dca54f3abc68de303bdfed6727112688e2f228
2020-05-03Snap for 6454467 from 2be6d25f6a940893ff918675eb55d95d021fee65 to sc-d1-releaseandroid-build-team Robot
Change-Id: I7ceaad7c76a1875f0c67dc8843411a1ed34ce6e2
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: aff0371ad4 am: 9f64794313 am: c7e9ef7417 am: fe7aec1d88 Change-Id: Ibffe2b0287259020ee87b371862617847c1101cf
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: e900a9011c am: 8851f4f535 am: c64fa9da6b Change-Id: I8ff49abe9a576dc210609a7914795af3d5582461
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
b6add02184 am: 1f1f72ce6d am: d7a2f5d25b am: 6e4ecb8e3b Change-Id: I766b590f78852b98266c748434f0afa537f4e202
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: aff0371ad4 am: 9f64794313 am: c7e9ef7417 Change-Id: Iafc13e409d7dddefc275b9f1071fbc057908058d
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: e900a9011c am: 8851f4f535 Change-Id: I47fa44fc098508c8db535d0a0d6e67588ab5674f
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: aff0371ad4 am: 9f64794313 Change-Id: Ie1821c9d3de9a49d3a15a3beee54bbc12e29bdf7
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
b6add02184 am: 1f1f72ce6d am: d7a2f5d25b Change-Id: I8a669bc720b4a4a89ed8c0510fa82944dbd9c092
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: aff0371ad4 Change-Id: I58135d3fe2f2095e7d2d2cad1e3494339b80b762
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
ea36b09549 am: e900a9011c Change-Id: I694f8e2fc0c918b216bd5632e37de19217453d98
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ↵Andrei Onea
b6add02184 am: 1f1f72ce6d Change-Id: Iea7e72758851234fd3673d73e270f87e534b6369
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ea36b09549Andrei Onea
Change-Id: I2547534d94a0d290f511604f190413ac9c9ba228
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: ea36b09549android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseAndrei Onea
Change-Id: I65a0c313a718f6c252dd2904112cd552599f5a1c
2020-05-01Add dexlib target that doesn't bundle commons-cli am: 9b3c02f8d1 am: b6add02184Andrei Onea
Change-Id: I32144f776a970e86be833dddf5696728b964d60a
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 19:21:15 +0000