aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Revert "Export libxml2_headers""android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Treehugger Robot2017-04-251-6/+1
|\
| * Revert "Export libxml2_headers"Vijay Venkatraman2017-04-241-6/+1
* | Merge "Export libicuuc headers"Treehugger Robot2017-04-241-0/+1
|\ \
| * | Export libicuuc headersColin Cross2017-04-241-0/+1
* | | Merge "Export libxml2_headers"Vijay Venkatraman2017-04-211-1/+6
|\ \ \ | |/ / |/| / | |/
| * Export libxml2_headersVijay Venkatraman2017-04-201-1/+6
|/
* Merge "Convert external/libxml2 to Android.bp"Colin Cross2017-04-202-94/+98
|\
| * Convert external/libxml2 to Android.bpColin Cross2017-04-202-94/+98
|/
* Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: 1b932...android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1o-previewDan Willemsen2016-09-131-1/+1
|\
| * Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: 1b932...Dan Willemsen2016-09-131-1/+1
| |\
| | * Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n"Dan Willemsen2016-09-131-1/+1
| | |\
| | | * Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n"android-n-mr1-preview-2android-n-mr1-preview-1Dan Willemsen2016-09-131-1/+1
| | | |\
| | | | * Rename libicuuc-host/libicui18n-host to libicuuc/libicui18nDan Willemsen2016-09-121-1/+1
| | | |/
* | | | Merge "Use %z instead of %l for size_t." am: dc41c87d63 am: 2cc71ed02dXin Li2016-09-081-1/+1
|\| | |
| * | | Merge "Use %z instead of %l for size_t." am: dc41c87d63Xin Li2016-09-081-1/+1
| |\| |
| | * | Merge "Use %z instead of %l for size_t."Xin Li2016-09-081-1/+1
| | |\|
| | | * Merge "Use %z instead of %l for size_t."Treehugger Robot2016-09-081-1/+1
| | |/|
| | | * Use %z instead of %l for size_t.Xin Li2016-09-071-1/+1
| | |/
* | | Merge remote-tracking branch 'goog/upstream-master' into mymerge am: a136fc2e5aXin Li2016-08-18208-2366/+5525
|\ \ \
| * \ \ Merge remote-tracking branch 'goog/upstream-master' into mymergeandroid-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r3android-7.1.2_r2android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2-devXin Li2016-08-18208-2366/+5525
| |\ \ \
| | * | | Merge remote-tracking branch 'goog/upstream-master' into mymergeandroid-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r6android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1nougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1-releasenougat-mr1-devnougat-mr1-cts-releaseXin Li2016-08-15208-2366/+5525
| |/ / /
* | | | Merge \\\"Update instructions for merging upstream changes.\\\" am: 17f8bff8b...Xin Li2016-07-211-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge \\"Update instructions for merging upstream changes.\\" am: 17f8bff8b0Xin Li2016-07-211-3/+1
|/| | | | | |/ | |/|
| * | Merge \"Update instructions for merging upstream changes.\"Xin Li2016-07-211-3/+1
|/| |
| * | Merge "Update instructions for merging upstream changes."Treehugger Robot2016-07-211-3/+1
| |\ \
| | * | Update instructions for merging upstream changes.Xin Li2016-07-211-3/+1
| |/ /
* | | Merge "libxml2: remove HTML support" am: 2c91383Sergio Giro2016-04-130-0/+0
|\ \ \
| * | | Merge "libxml2: remove HTML support"Sergio Giro2016-04-134-8404/+7
| |\| |
| | * | Merge "libxml2: remove HTML support"android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Sergio Giro2016-04-134-8404/+7
| |/| |
| | * | libxml2: remove HTML supportSergio Giro2016-04-134-8404/+7
| |/ /
* | | libxml2: remove HTML supportSergio Giro2016-04-134-8404/+7
|\ \ \ | | |/ | |/|
| * | libxml2: remove HTML supportandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r1nougat-releasenougat-dr1-releasenougat-devnougat-cts-releaseSergio Giro2016-04-134-8404/+7
|/ /
* | Merge "libxml2: silence -Wunused-parameter."Elliott Hughes2016-01-221-0/+1
|\|
| * Merge "libxml2: silence -Wunused-parameter."android-n-preview-2android-n-preview-1Elliott Hughes2016-01-221-0/+1
| |\
| | * libxml2: silence -Wunused-parameter.Elliott Hughes2016-01-211-0/+1
| |/
* | Merge remote-tracking branch \'libxml2/master\' into mymergeElliott Hughes2015-12-0222-152/+492
|\|
| * Merge remote-tracking branch 'libxml2/master' into mymergeElliott Hughes2015-12-0222-152/+492
| |\
| | * Release of libxml2-2.9.3Daniel Veillard2015-11-2013-94/+335
| | * CVE-2015-8242 Buffer overead with HTML parser in push modeHugh Davenport2015-11-201-3/+3
| | * CVE-2015-7500 Fix memory access error due to incorrect entities boundariesDaniel Veillard2015-11-202-8/+27
| | * Bug on creating new stream from entityDaniel Veillard2015-11-201-0/+2
| | * Fix some loop issues embedding NEXTDaniel Veillard2015-11-201-2/+4
| | * Detect incoherency on GROWDaniel Veillard2015-11-201-1/+8
| | * Do not print error context when there is noneDaniel Veillard2015-11-201-1/+3
| | * Reuse xmlHaltParser() where it makes senseDaniel Veillard2015-11-201-20/+17
| | * Add xmlHaltParser() to stop the parserDaniel Veillard2015-11-201-5/+29
| | * CVE-2015-5312 Another entity expansion issueDavid Drysdale2015-11-201-0/+4
| | * CVE-2015-7497 Avoid an heap buffer overflow in xmlDictComputeFastQKeyDavid Drysdale2015-11-201-1/+4
| | * xmlStopParser reset errNoDaniel Veillard2015-11-091-0/+3
| | * Avoid processing entities after encoding conversion failuresDaniel Veillard2015-11-092-3/+15