tree 950f7e11004dbb1369de0b68d6a60ef5a696c5ba
parent 30b01f5b6ece6c5204d46f6b2ea90745dbc69826
parent 7644aec2c85d1db63d4467421995a237de6c3141
author Treehugger Robot <treehugger-gerrit@google.com> 1588173935 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588173935 +0000

Merge "Add METADATA to tinyxml: zlib+Apache2=NOTICE" am: 17ad4f038f am: 74d07fafdc am: 7644aec2c8

Change-Id: I9ac497680d100210697d8628645c909f1e7132c9