tree 197697956b756529f4c941d4c363a680485ff3e2
parent 812d23c128161cde6df9aec6275ccc3d64094437
parent 0215a7f02a317946649cf748452e972b382a19af
author Chih-Hung Hsieh <chh@google.com> 1506988561 +0000
committer android-build-merger <android-build-merger@google.com> 1506988561 +0000

Merge "Use -Werror in external/pcre" am: 2ea2c73314
am: 0215a7f02a

Change-Id: Ia3664d28e7956a1a890834762a6ea29bb2402c0c