tree 7ec5bf9c5d8c7f3b73939f42ddbb33585e646cf4
parent 2580948047431760824c2c47d0fa087ea1682b6e
parent 2549a6b3a1694cac4644950bf70d0f4650541378
author Elliott Hughes <enh@google.com> 1532732894 -0700
committer android-build-merger <android-build-merger@google.com> 1532732894 -0700

Merge "Upgrade to pcre2 version 10.31." am: b66e00ca10
am: 2549a6b3a1

Change-Id: If490d37a661d0b88af2e18e013df35d173ca05f3