tree 4fb737065961bdbc6c32bb8a8719b100f5266395
parent 45226a63ba891614dee261fe6c5bd80f5f25184a
parent ad171f1861bcb2192d4f2dbc2ccff9a8ae32fb59
author Chih-Hung Hsieh <chh@google.com> 1506549288 +0000
committer android-build-merger <android-build-merger@google.com> 1506549288 +0000

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

Change-Id: I5918e1f0b8c5f8d9a0edf03d44a625f9f4ea748f