tree 74afc6398e14644c004f8fb5b6efa16bcb6f1849
parent 92a7a7ab5a7da0da09130eb46d4a6a72cb9ac633
parent 9777d249c8e7c7a3a1bff520af28ae2db6c97867
author Dan Willemsen <dwillemsen@google.com> 1489620002 +0000
committer android-build-merger <android-build-merger@google.com> 1489620002 +0000

Merge "Enable libpcre2 on linux_bionic builds" am: 8d900ce60a
am: 9777d249c8

Change-Id: I6cb32e5fdb19796b9d532a60baa6145189917447