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

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

Change-Id: I32e9c8b78020dcf7e2bf4038637e73e93256fa26