tree 74afc6398e14644c004f8fb5b6efa16bcb6f1849
parent 99b4ac5c68c1c4a74f23892e0be51ed48a3988b3
parent dc7b54f95fc4203ced55dfcebb1b5a641731f599
author Dan Willemsen <dwillemsen@google.com> 1489620123 +0000
committer android-build-merger <android-build-merger@google.com> 1489620123 +0000

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

Change-Id: Icbf3a7f29acb4eb91149019b6d7d8605c793fcde