tree 5ed8fec6067f6a6d85590e2d399526af6db58b2d
parent 72815003056fcb364cf65389a0cb3cb7edc7bb71
parent 04fc5e3e1a393db61bd49e016ba30226dd0adc71
author Elliott Hughes <enh@google.com> 1533157738 -0700
committer android-build-merger <android-build-merger@google.com> 1533157738 -0700

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

Change-Id: Idb76f69370be055a049285767f9926f0ba0e83ba