tree 9416dd7928a6229e739c5069a205c35544f9e926
parent f906e415f6691826e1693e607dbf92b0b3571bac
parent bf99fe8e05bab2db2d6c6b25dca66492f9c05cd6
author Brian C. Young <bcyoung@google.com> 1491932735 +0000
committer android-build-merger <android-build-merger@google.com> 1491932735 +0000

DO NOT MERGE: Heap buffer overflow in xmlAddID am: 969e874097 am: a618c631d0 am: 0ec4728680  -s ours am: e1c18bac61  -s ours am: 3fd39b343a am: 24094c7d88  -s ours am: d559ec4b68
am: bf99fe8e05

Change-Id: Iacadd03bd5b4a08ba6cdd3926d3dbd63abd5d34b