aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-21Snap for 7478028 from b70917a06af5a5e0687049d49cb1238681d427f4 to ↵android-mainline-12.0.0_r97android-mainline-12.0.0_r85android-mainline-12.0.0_r68android-mainline-12.0.0_r41android-mainline-12.0.0_r21android-mainline-12.0.0_r1android12-mainline-adbd-releaseandroid-build-team Robot
mainline-adbd-release Change-Id: Iae583817e7c1fd3e0954f0c659ab1d020b32b14e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: 4906db6ae5 -s ours am: af4fb9fa8f -s ours am skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iff0885aad039143a367091bb18bbdfce002d22ed
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -s ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-s-v2-preview-1Xin Li
ours am: 4906db6ae5 -s ours am skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I671e5b79af283bba024771c107f5bf36077e5bb0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3881c145da -s oursXin Li
am skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I01d377a2babc97bfcef990637fabaec7d5dd603b
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: I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 Change-Id: I53b8b7b8ffe0b8807c1824780c72b0ddd9e83225
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2" am: b37166d895 am: ↵Treehugger Robot
89e54811aa am: 61ca10473c am: 14ffb52936 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I08521f01ee993aebecc182c93236ca09a6e56d6f
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2" am: b37166d895 am: ↵Treehugger Robot
89e54811aa am: 61ca10473c Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1294ecabc94be2d4cede260d6f8452a2cc063074
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2" am: b37166d895 am: ↵Treehugger Robot
89e54811aa Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icac8ada24f3d4f239dd6c007234cc145167b0d0c
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2" am: b37166d895Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1588829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I97c1f9a74d5f8706c62266ebc1be294923b95f20
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/bzip2Bob Badour
Added SPDX-license-identifier-BSD legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I22d7c58f36a4227732ac28d9275d22d7b8d42423
2021-02-09Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into ↵Treehugger Robot
upstream-mas" am: b4ea5c3c54 am: 71f0a6e3bb am: 09d6838ce7 am: b2e4505689 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I36e94b7766d7e0f058550385283a8213309aa82f
2021-02-09Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into ↵Treehugger Robot
upstream-mas" am: b4ea5c3c54 am: 71f0a6e3bb am: 09d6838ce7 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I951a70c12cc16ad0827b0b2019d86522f6ff60cf
2021-02-09Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into ↵Treehugger Robot
upstream-mas" am: b4ea5c3c54 am: 71f0a6e3bb Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id56f76519b71ae5044bc2e3fe3f232bade416b4d
2021-02-08Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into ↵Treehugger Robot
upstream-mas" am: b4ea5c3c54 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1580201 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5a777fa5e8cfb5abae10f04c453506225ca99d55
2021-02-08Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into ↵Treehugger Robot
upstream-mas"
2021-02-08Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into upstream-masElliott Hughes
Fix METADATA and get in sync with upstream. Bug: http://b/179636234 Test: treehugger Change-Id: I832ef9ca92e0a577aeea69cb93a0d10969198b27
2020-11-24Mark ab/6881855 as merged am: 72067b0fb4 am: 825f8f52c4Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/13111946 Change-Id: Ic1b4908596bdbfc5a3a0606462a38786414646a4
2020-11-24Mark ab/6881855 as merged am: 72067b0fb4Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/13111946 Change-Id: I395973694367a1ab04cf8b3c3a3a3df5ac63cd52
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ic7ff06eda9a716782cb4ed09bb121710db262730
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: c6dbbc82eb -s ours am: ↵Xin Li
a606d075f7 -s ours am: fb9deff4e6 -s ours am skip reason: Change-Id Id641096642561af9915b18b899b9123afeb13669 with SHA-1 5e4f974ea5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12796963 Change-Id: I4db9908cb12ea510755070b90893af99324e0971
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: c6dbbc82eb -s ours am: ↵Xin Li
a606d075f7 -s ours am skip reason: Change-Id Id641096642561af9915b18b899b9123afeb13669 with SHA-1 5e4f974ea5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12796963 Change-Id: I20f9d2156d3054243cffa06e58f27d87cd5dc546
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: c6dbbc82eb -s oursXin Li
am skip reason: Change-Id Id641096642561af9915b18b899b9123afeb13669 with SHA-1 5e4f974ea5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12796963 Change-Id: Ie0e2bd0c3c7bb810c7943954fd3fea4b3b9d903a
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Id641096642561af9915b18b899b9123afeb13669 Change-Id: Ieb95ba69251108be74ab07b75c7fd437301e6c7d
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am: 66bd02c98b -s ours am: 58dd9ee8ce -s ours am: 7accb6b15b -s ours am skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867 Change-Id: I1a82cee829739532c662acf19490ff798f4544fb
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am: 66bd02c98b -s ours am: 58dd9ee8ce -s ours am skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867 Change-Id: Ie06a3bd95f063f4ddfa3a1f9d49fd0ce04b2459c
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am: 66bd02c98b -s ours am skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867 Change-Id: I9c51372b72dfbb0acbab180d272849aca566a636
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/bzip2/+/12469867 Change-Id: I9ef9f7f08755b25d41a967d543a13440ae8cc48f
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I207b48f559ebeef67028e7273ee46aa07accaf75 Change-Id: Ic5ec4289ae20d11298ad8d036de66c92683ed362
2020-08-20Merge "Allow libsnapshot to link to libbz." am: 2ef0545ad7 am: 3eb1df41da ↵David Anderson
am: d3f609182f am: 0cda1e14cb am: fb1339d046 Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619 Change-Id: I259b3588d6e3c9e57c3020e7cd8bc43b3c093f7f
2020-08-20Merge "Allow libsnapshot to link to libbz." am: 2ef0545ad7 am: 3eb1df41da ↵David Anderson
am: d3f609182f am: 0cda1e14cb Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619 Change-Id: I5f4a8a90fcb7c972d8148abe28c291a9f74a8957
2020-08-20Merge "Allow libsnapshot to link to libbz." am: 2ef0545ad7 am: 3eb1df41da ↵David Anderson
am: d3f609182f Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619 Change-Id: I2f7519d211c46bd3baf8b09903a059fc591d8dbb
2020-08-20Merge "Allow libsnapshot to link to libbz." am: 2ef0545ad7 am: 3eb1df41daDavid Anderson
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619 Change-Id: I08b78692c5d75d358c5a39248501795563720767
2020-08-19Merge "Allow libsnapshot to link to libbz." am: 2ef0545ad7David Anderson
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1393619 Change-Id: I22c5e83161689f83a299516148fe193e881b40e9
2020-08-19Merge "Allow libsnapshot to link to libbz."David Anderson
2020-08-06Allow libsnapshot to link to libbz.David Anderson
Bug: 1378463 Test: m vab_convert_payload Change-Id: Ic58157fc78ecbc212fb3789651eb3954cfe5158e
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE" am: eb041812a7 am: ↵Treehugger Robot
a75d53c4ba am: c2e02fb6bf am: 5e4f974ea5 am: e2d2915caa Change-Id: I8bbe65d7b4d3b8107bf24f6662efbd5a98267cce
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE" am: eb041812a7 am: ↵Treehugger Robot
a75d53c4ba am: c2e02fb6bf am: 5e4f974ea5 Change-Id: I672be222e60d7222691aae97d569ab804c4b1f67
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE" am: eb041812a7 am: ↵Treehugger Robot
a75d53c4ba am: c2e02fb6bf Change-Id: Id641096642561af9915b18b899b9123afeb13669
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE" am: eb041812a7 am: a75d53c4baTreehugger Robot
Change-Id: I207b48f559ebeef67028e7273ee46aa07accaf75
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE" am: eb041812a7android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I1a69e5717a7ae29d2d30a66ce28eb9822a6e9a5c
2020-04-29Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE"Treehugger Robot
2020-04-28Add METADATA to bzip2: Apache2+BSD=NOTICEBob Badour
GPL fonts in manual have addendum allowing inclusion in documents. Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I3cb5aeed9446318825ff939c63df57d1ad675394
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bfbb28f836 -s ours am: 9cda868da9 am: 5ff4807347 am: f957b634f6 -s ours am skip reason: subject contains skip directive Change-Id: I0cf3758fffe0ec6505117e331929f97dfe5d996a
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bfbb28f836 -s ours am: 9cda868da9 am: 5ff4807347 Change-Id: I7f06441bed6d9250df58a7840b8b55a4f6f970b7
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bfbb28f836 -s ours am: 9cda868da9 Change-Id: Ieb14bd28064d8d0033711f0ede81752ba6f9ddea
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bfbb28f836 -s ours am skip reason: subject contains skip directive Change-Id: Ib2e911728f2b793e890ee47b902d46f1914d2166
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I1eacd3e9b39d310a443221eed127ffa65db93d86
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4b94ddbfd0 am: ↵Treehugger Robot
216f77451a am: 7667d2d91a am: 8f404e53d9 am: 431e73294f Change-Id: Ia2a8733cd2a86216d068a96a3ca2b77cc965f86a
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4b94ddbfd0 am: ↵Treehugger Robot
216f77451a am: 7667d2d91a am: 8f404e53d9 Change-Id: I583e3151744cdfde30bd94719fc6bd79c8ef14f0
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 07:26:13 +0000