tree 4fb737065961bdbc6c32bb8a8719b100f5266395
parent d16cf94146b37f1b68c12c942b820cf66bcf83c8
parent 44802c7a437c6c4d3bff9e7be703dc62c66bc740
author Chih-Hung Hsieh <chh@google.com> 1506549003 +0000
committer android-build-merger <android-build-merger@google.com> 1506549003 +0000

Merge "Use -Werror in external/expat" am: 1071d2dbae
am: 44802c7a43

Change-Id: I87181cd8db9b2b027da3495a0e50a3bad41b1560