aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-13Merge "Upgrade libxml2 to e1bcffea180d6cc0651757bb64284a763e0e2239" am: ↵Elliott Hughes
e89c501e7f am: 112dac19f1 am: 7a3e4ea229 am: 2c40d36f28 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1706766 Change-Id: I059f8f4fc6aa23e7085a4d7f7d2820218d1367d9
2021-05-13Merge "Upgrade libxml2 to e1bcffea180d6cc0651757bb64284a763e0e2239" am: ↵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-releaseElliott Hughes
e89c501e7f am: 112dac19f1 am: 7a3e4ea229 am: 2c40d36f28 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1706766 Change-Id: I6d3953f5fe208c9a80c9236c25f13fce0f0d7c82
2021-05-13Merge "Upgrade libxml2 to e1bcffea180d6cc0651757bb64284a763e0e2239" am: ↵Elliott Hughes
e89c501e7f am: 112dac19f1 am: 7a3e4ea229 am: 2c40d36f28 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1706766 Change-Id: I6f59ace105db8b7a04cb17045afeea54d6217be3
2021-05-13Merge "Upgrade libxml2 to e1bcffea180d6cc0651757bb64284a763e0e2239" am: ↵Elliott Hughes
e89c501e7f am: 112dac19f1 am: 7a3e4ea229 am: 2c40d36f28 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1706766 Change-Id: I6bf5ee2eb5ddc0292d3c4080918124e7a739d7ed
2021-05-13Merge "Upgrade libxml2 to e1bcffea180d6cc0651757bb64284a763e0e2239" am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-devElliott Hughes
e89c501e7f am: 112dac19f1 am: 7a3e4ea229 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1706766 Change-Id: I2ce52c5ae5f65d82054dcfe05b9091e49bbb028d
2021-05-13Merge "Upgrade libxml2 to e1bcffea180d6cc0651757bb64284a763e0e2239" am: ↵Elliott Hughes
e89c501e7f am: 112dac19f1 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1706766 Change-Id: I9f86473da1ebf017f974a6697f2e7d3c657dee60
2021-05-13Merge "Upgrade libxml2 to e1bcffea180d6cc0651757bb64284a763e0e2239" am: ↵android-s-beta-4android-s-beta-3android-s-beta-4Elliott Hughes
e89c501e7f Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1706766 Change-Id: I236eef9c75df112984e40409a504221ef9b7a82f
2021-05-13Merge "Upgrade libxml2 to e1bcffea180d6cc0651757bb64284a763e0e2239"android-s-beta-2android-s-beta-1Elliott Hughes
2021-05-13Upgrade libxml2 to e1bcffea180d6cc0651757bb64284a763e0e2239Elliott Hughes
Test: make Change-Id: I59cf6898af49ff82070ddb18c15c217179172799
2021-05-07Merge "Upgrade libxml2 to 7279d236364739a05657a8a614c15990eb08d0c6" am: ↵Elliott Hughes
7cb4d979c3 am: 80288015e5 am: b7ae737b76 am: b734db3aeb am: a81f4540bc Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1699085 Change-Id: I0e3de1ca6d946cd722b42139e85d5ec08f4e6100
2021-05-07Merge "Upgrade libxml2 to 7279d236364739a05657a8a614c15990eb08d0c6" am: ↵Elliott Hughes
7cb4d979c3 am: 80288015e5 am: b7ae737b76 am: b734db3aeb Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1699085 Change-Id: I9102df30528d28e0027fb5a4d5b69949cb559768
2021-05-07Merge "Upgrade libxml2 to 7279d236364739a05657a8a614c15990eb08d0c6" am: ↵Elliott Hughes
7cb4d979c3 am: 80288015e5 am: b7ae737b76 am: b734db3aeb Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1699085 Change-Id: I9c0638356c1f5d6ce60bdee477f73c8686f428d2
2021-05-07Merge "Upgrade libxml2 to 7279d236364739a05657a8a614c15990eb08d0c6" am: ↵Elliott Hughes
7cb4d979c3 am: 80288015e5 am: b7ae737b76 am: b734db3aeb Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1699085 Change-Id: I456b756279f25a6443316ae9059b2176b5ec7c0b
2021-05-07Merge "Upgrade libxml2 to 7279d236364739a05657a8a614c15990eb08d0c6" am: ↵Elliott Hughes
7cb4d979c3 am: 80288015e5 am: b7ae737b76 am: b734db3aeb Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1699085 Change-Id: I9bcef98a0249ee27d5fccbfe09aa3f88f3c460a9
2021-05-07Merge "Upgrade libxml2 to 7279d236364739a05657a8a614c15990eb08d0c6" am: ↵Elliott Hughes
7cb4d979c3 am: 80288015e5 am: b7ae737b76 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1699085 Change-Id: I287f2d2f5af7cc8f4bd6b3cd533c8f2ad0874e31
2021-05-07Merge "Upgrade libxml2 to 7279d236364739a05657a8a614c15990eb08d0c6" am: ↵Elliott Hughes
7cb4d979c3 am: 80288015e5 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1699085 Change-Id: I43e796d2c6106eea9ed7a2177f9aa21c3754e7fd
2021-05-07Merge "Upgrade libxml2 to 7279d236364739a05657a8a614c15990eb08d0c6" am: ↵Elliott Hughes
7cb4d979c3 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1699085 Change-Id: I191e7249c88e5edc5ee75385016634643c0d4ece
2021-05-07Merge "Upgrade libxml2 to 7279d236364739a05657a8a614c15990eb08d0c6"Elliott Hughes
2021-05-06Upgrade libxml2 to 7279d236364739a05657a8a614c15990eb08d0c6Elliott Hughes
Test: make Change-Id: Ie62af90b30004dc2b9b4c98c4ede3bd248d004cc
2021-04-20Merge "Make libxml2 available to com.android.virt" am: 39b79a220e am: ↵Jooyung Han
90db829280 am: 7b8ecf0c22 am: caf8e6bf6d Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1680265 Change-Id: I6e50a3a8144519c21bc27dbe797c168730e441b6
2021-04-20Merge "Make libxml2 available to com.android.virt" am: 39b79a220e am: ↵Jooyung Han
90db829280 am: 7b8ecf0c22 am: caf8e6bf6d Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1680265 Change-Id: I21a3143a449fd5eee7633cd1ad6988b427fb90f0
2021-04-20Merge "Make libxml2 available to com.android.virt" am: 39b79a220e am: ↵Jooyung Han
90db829280 am: 7b8ecf0c22 am: caf8e6bf6d Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1680265 Change-Id: I331c8e7d6baee614fdbe965f43eab747441ea5d9
2021-04-20Merge "Make libxml2 available to com.android.virt" am: 39b79a220e am: ↵Jooyung Han
90db829280 am: 7b8ecf0c22 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1680265 Change-Id: I1eb5879be3e7ac35802748898a1f70da7a34b9d3
2021-04-20Merge "Make libxml2 available to com.android.virt" am: 39b79a220e am: 90db829280Jooyung Han
Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1680265 Change-Id: Ifd899627340a71e80afd4895f27f4767d28f5ec1
2021-04-20Merge "Make libxml2 available to com.android.virt" am: 39b79a220eJooyung Han
Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1680265 Change-Id: I24e36cb1f01b7723f8b08502f8ef21bb7e60f5d7
2021-04-19Merge "Make libxml2 available to com.android.virt"Jooyung Han
2021-04-20Make libxml2 available to com.android.virtJooyung Han
libxml2 is used to read apex-info-list.xml by a tool in the com.android.virt apex. Bug: 185069443 Test: MicrodroidTestCase Change-Id: Ib4019f234f1fed2ad5cddb8597001ed93b011d87
2021-03-05Merge "Add min_sdk_version for ART module." am: aa9baca6c5 am: 7d217ba994 ↵Nicolas Geoffray
am: 4a43b73e96 am: f28fc69985 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1615879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4287e30d979769232738ffff7ffee64e8eedce5a
2021-03-05Merge "Add min_sdk_version for ART module." am: aa9baca6c5 am: 7d217ba994 ↵Nicolas Geoffray
am: 4a43b73e96 am: f28fc69985 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1615879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I97f1d084c2a3792346c6486cb19af7a2b70d2bf3
2021-03-05Merge "Add min_sdk_version for ART module." am: aa9baca6c5 am: 7d217ba994 ↵Nicolas Geoffray
am: 4a43b73e96 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1615879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I131c91d6006fd11bf022ba9e0079354602915a9b
2021-03-05Merge "Add min_sdk_version for ART module." am: aa9baca6c5 am: 7d217ba994Nicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1615879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I03219a176e3050feb2a20e1890c4bb5afc34a50f
2021-03-05Merge "Add min_sdk_version for ART module." am: aa9baca6c5Nicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1615879 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3fef220a38b841c82cb6675e979e31148223c269
2021-03-04Merge "Add min_sdk_version for ART module."Nicolas Geoffray
2021-03-04Add min_sdk_version for ART module.Nicolas Geoffray
Bug: 180399951 Test: m Change-Id: Ia09ee30f4612ea1792ca264224fd0faacf8d9c84
2021-02-25Merge "Upgrade libxml2 to ce2fbaa89da627a6c6cd6344d5339a76feba94b5" am: ↵Haibo Huang
ef24f15415 am: c92b3ec2db am: 2daea33a69 am: d015330e25 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1604821 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iec380d6a80ec2b9bdcea8e55b6367b2def6df046
2021-02-25Merge "Upgrade libxml2 to ce2fbaa89da627a6c6cd6344d5339a76feba94b5" am: ↵Haibo Huang
ef24f15415 am: c92b3ec2db am: 2daea33a69 am: d015330e25 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1604821 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If686a987fd138c21f350082d203de8a85c3372d4
2021-02-25Merge "Upgrade libxml2 to ce2fbaa89da627a6c6cd6344d5339a76feba94b5" am: ↵Haibo Huang
ef24f15415 am: c92b3ec2db am: 2daea33a69 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1604821 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia81b8573203e3cabbcb4cdfdd89d8346ace9261f
2021-02-25Merge "Upgrade libxml2 to ce2fbaa89da627a6c6cd6344d5339a76feba94b5" am: ↵Haibo Huang
ef24f15415 am: c92b3ec2db Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1604821 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I30a2c02fd8671c15046905684436c25c9b36751f
2021-02-24Merge "Upgrade libxml2 to ce2fbaa89da627a6c6cd6344d5339a76feba94b5" am: ↵Haibo Huang
ef24f15415 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1604821 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ba0eca57d1e13caffa501ed8ecd05f4985d009f
2021-02-24Merge "Upgrade libxml2 to ce2fbaa89da627a6c6cd6344d5339a76feba94b5"Haibo Huang
2021-02-24Upgrade libxml2 to ce2fbaa89da627a6c6cd6344d5339a76feba94b5Haibo Huang
Bug: 176574965 Change-Id: Icc9e211a7a85cc9ef7db5a944a09377a41a28ccd
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 87fd876e9d -s ↵Xin Li
ours am: b4c55f2869 -s ours am: 57440c09a3 -s ours am skip reason: Change-Id I31cfe7fc5fe5786c37857c31b41a11cd4107d252 with SHA-1 38e7871dc8 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I123aa6c2914290e1fd1fabbb2c04a8ef01c2f268
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 87fd876e9d -s ↵Xin Li
ours am: b4c55f2869 -s ours am: 57440c09a3 -s ours am skip reason: Change-Id I31cfe7fc5fe5786c37857c31b41a11cd4107d252 with SHA-1 38e7871dc8 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7f76899991352c81ae00121853da2dcb33a7de7f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 87fd876e9d -s ↵Xin Li
ours am: b4c55f2869 -s ours am skip reason: Change-Id I31cfe7fc5fe5786c37857c31b41a11cd4107d252 with SHA-1 38e7871dc8 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I80834d4226bc0692caa0bcd57bd547458f908979
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 87fd876e9d -s oursXin Li
am skip reason: Change-Id I31cfe7fc5fe5786c37857c31b41a11cd4107d252 with SHA-1 38e7871dc8 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8a8fe35c3b793985fa41aefe5e9598ced748c05b
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I31cfe7fc5fe5786c37857c31b41a11cd4107d252 Change-Id: I68606ee42158d618901a6454edc5b8fb84d22bc0
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libxml2" am: 9b4ab57ad3 am: ↵Treehugger Robot
d160ad14d0 am: b491b69d24 am: 542447145d Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1588982 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0edbaf471f66ba5dde630acbf3d76cd286cd8bb4
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libxml2" am: 9b4ab57ad3 am: ↵Treehugger Robot
d160ad14d0 am: b491b69d24 am: 542447145d Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1588982 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If5815369f494f7da9e84a73791b3e3b93b6f65d0
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libxml2" am: 9b4ab57ad3 am: ↵Treehugger Robot
d160ad14d0 am: b491b69d24 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1588982 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie692ec84d5fba3b684fba301db2a065a9ab466ee
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libxml2" am: 9b4ab57ad3 am: ↵Treehugger Robot
d160ad14d0 Original change: https://android-review.googlesource.com/c/platform/external/libxml2/+/1588982 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I624f25d12695443111fb606bbe7f0f9ccfc3c8fa
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 05:28:02 +0000