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

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

Change-Id: Ic50513beb45420a131f21e1615fd98208dfd2309