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

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

Change-Id: Ibdf5675e870408f881a1d8ba61b400a8c091b296