tree 950f7e11004dbb1369de0b68d6a60ef5a696c5ba
parent 9578059574466130dc5c30c8b231000125d78fd4
parent 7a4bee04f5781ffc53fd4c37f8b382c98afdddea
author Herbert Xue <herbertxue@google.com> 1605768473 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605768473 +0000

Merge "Revert "Remove tinyxml (not to be confused with tinyxml2)."" am: 7a4bee04f5

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml/+/1504281

Change-Id: I37920f7f25dbc58cbd2da9beba5daf652cb46125