tree 638b917642411b9358afbc619c993e31143cadd1
parent 9c03b0d3820d7496c2ea62efade5cdf1853c245b
parent 119ea69917f3e06692de2a4430c291487eb74eba
author Dan Willemsen <dwillemsen@google.com> 1504976788 +0000
committer android-build-merger <android-build-merger@google.com> 1504976788 +0000

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

Change-Id: I4ea53aef1f9d94a88c31a841f41122da199cfdc8