tree 32e004b0d535ef9ec1e8455d84118e11e0140eaa
parent 59a56520d65ab2d94fbfad24a9098f5c49da403e
parent 005359ece1438a9d1abb3f66cfe51c4e1428d9f9
author Elliott Hughes <enh@google.com> 1524583151 -0700
committer android-build-merger <android-build-merger@google.com> 1524583151 -0700

Merge "Switch to PCRE grep." am: d895c07ca0
am: 005359ece1

Change-Id: I7d35047229ad7ca0930b7744a9d2d0c763909c14