tree 638b917642411b9358afbc619c993e31143cadd1
parent 9c03b0d3820d7496c2ea62efade5cdf1853c245b
parent 366a573817de93aa809c8d2fc23909e4c07c8ec7
author Dan Willemsen <dwillemsen@google.com> 1504976483 +0000
committer android-build-merger <android-build-merger@google.com> 1504976483 +0000

Merge "Remove static implementations of libtinyxml" am: bd3c8f83c2 am: c1b9f4cb12
am: 366a573817

Change-Id: Ibec32b05a1280456e6f4e2cbfefc7415bd9f8fc1