tree 635be6e046844b3e0bd089d5e87af76b0230eabe
parent 222bbf4b3fb8e13c21686803e47e31aa3e4ad130
parent 7493756f8b996d34f56a4156f4cb972d7850148a
author Dan Willemsen <dwillemsen@google.com> 1468986108 +0000
committer android-build-merger <android-build-merger@google.com> 1468986108 +0000

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

Change-Id: I0190b33ceb7ec9dca4d4da3232122fb1b7746d33