tree dcfd608f2640dc9ee36abf25c948a58a0ea22459
parent 50a4171030d3b7df6a6925f5da0b463d7f1420eb
parent bd870377b47284ce2aeee1ec094f1fd33a6955d5
author Elliott Hughes <enh@google.com> 1513848872 +0000
committer android-build-merger <android-build-merger@google.com> 1513848872 +0000

Merge "StartsWith allows a std::string prefix now." am: 80ccac2fff
am: bd870377b4

Change-Id: I720e3ba91146cbbf783eb3ef4b8347f16c52ec05