tree 5ed8fec6067f6a6d85590e2d399526af6db58b2d
parent 3bc677351c1095ba2d350a80235f23dd1ae726e4
parent 6e71b4a27c7e5f2740e9346fa9232798586acaec
author Elliott Hughes <enh@google.com> 1533156535 -0700
committer android-build-merger <android-build-merger@google.com> 1533156535 -0700

Merge "Abandon plans to move to PCRE grep."
am: 6e71b4a27c

Change-Id: Ic76a3c268381e7bba202d761d9ee4bcfd25913cc