tree fda1d52a88507cea379bfc6361ebae6ee45752f6
parent f03a7f8a5caabefb00b1bc8293b39c1c1c9b5793
parent af24c0d24640df7dc1c422d8758d09bf80486ce6
author Elliott Hughes <enh@google.com> 1513837565 +0000
committer android-build-merger <android-build-merger@google.com> 1513837565 +0000

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

Change-Id: I3ac3071c0d59c809b37b7abf3393899dee6380bd