tree 635be6e046844b3e0bd089d5e87af76b0230eabe
parent 222bbf4b3fb8e13c21686803e47e31aa3e4ad130
parent 6ee691657add6cbef896cababe1120f53c85adb4
author Dan Willemsen <dwillemsen@google.com> 1468986287 +0000
committer android-build-merger <android-build-merger@google.com> 1468986287 +0000

Merge \\\"Convert pcre from Android.mk to Android.bp\\\" am: a6a950ff7d am: 7493756f8b
am: 6ee691657a

Change-Id: I04de07bccb2cec69a57ef866ee41f7de40b63a8c