diff options
author | Xin Li <delphij@google.com> | 2016-07-26 14:22:54 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2016-08-15 22:30:45 +0000 |
commit | a136fc2e5a8893a02b0912862d26a575fcbd641a (patch) | |
tree | 341dc6790424526b424173dc7bc5a1165db7de10 /result/errors/content1.xml.err | |
parent | edb5870767fed8712a9b77ef34097209b61ab2db (diff) | |
download | android_external_libxml2-a136fc2e5a8893a02b0912862d26a575fcbd641a.tar.gz android_external_libxml2-a136fc2e5a8893a02b0912862d26a575fcbd641a.tar.bz2 android_external_libxml2-a136fc2e5a8893a02b0912862d26a575fcbd641a.zip |
Merge remote-tracking branch 'goog/upstream-master' into mymerge
BUG: 29834751
Change-Id: I88fc1d4f86bcbd0ac0fe9acdbe764f3d738c5f32
(cherry picked from commit e3d78e1fe0669e9c7083a4de19f1e06171849b28)
Diffstat (limited to 'result/errors/content1.xml.err')
-rw-r--r-- | result/errors/content1.xml.err | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/result/errors/content1.xml.err b/result/errors/content1.xml.err index 425be393..9fcd6033 100644 --- a/result/errors/content1.xml.err +++ b/result/errors/content1.xml.err @@ -13,4 +13,4 @@ ^ ./test/errors/content1.xml:7: parser error : Start tag expected, '<' not found <!ELEMENT aElement (a |b * > - ^ + ^ |