tree f3bed2423f898615ad75aa13beb1fceb6d0ff44c
parent 1f58b4819ddedd563e92ad9203203b644cce2e81
parent 3a4a64ff80dc8e43877fbed93bd6fec6206c52fb
author Chih-Hung Hsieh <chh@google.com> 1507579015 +0000
committer android-build-merger <android-build-merger@google.com> 1507579015 +0000

Merge "Use -Werror in external/tinyxml2" am: 733c425397 am: b28b162838
am: 3a4a64ff80

Change-Id: I451ff7e0fca73527c2075677707f5606d22c8d85