tree 37563d7a29db371b527f617ade43b59072606621
parent 1748d42772cdff4aad02a4a488f2be25f025958c
parent 3601d3af3a6bfc75046ae3523ce2286d1f63c561
author Elliott Hughes <enh@google.com> 1513877982 +0000
committer android-build-merger <android-build-merger@google.com> 1513877982 +0000

Merge "StartsWith/EndsWith allow std::string prefixes/suffixes now." am: 2aa4cc4f36 am: af24c0d246
am: 3601d3af3a

Change-Id: Ib8547528ba82613b192fd1967af170739d79bbe5