tree 197697956b756529f4c941d4c363a680485ff3e2
parent 048a1e1eaed76da8716819f786adf7b966a7f26e
parent 4768daadd257b8f56498b00950bcc5807a2ba6ff
author Chih-Hung Hsieh <chh@google.com> 1506988923 +0000
committer android-build-merger <android-build-merger@google.com> 1506988923 +0000

Merge "Use -Werror in external/pcre" am: 2ea2c73314 am: 0215a7f02a am: 66082ff0d6
am: 4768daadd2

Change-Id: I8401ffadea028ab6667e257f0b1258f1210e8707