tree 36f9ef9f8c7b91340569a0f5080a09a6d821ed7e
parent 5294ba4a563b08a9dff560d3f162e3824fa760a5
parent 19082b1e716b25671121a84c097f72fdd56f0fc7
author Elliott Hughes <enh@google.com> 1532705247 -0700
committer android-build-merger <android-build-merger@google.com> 1532705247 -0700

Merge "Go back to BSD grep for now." am: 6420c7d130 am: c897ee0042 am: 2580948047
am: 19082b1e71

Change-Id: Ida98e1236cd30c9a30938fbb3842c63496650bd6