tree f5413c369845604f518505523d807cc1b9f4e482
parent c35b5c64a8d8192e8e04b378510c64737517c606
parent 92be1378f9998ab108e2c4f8de6d53d3481f7586
author Elliott Hughes <enh@google.com> 1513867733 +0000
committer android-build-merger <android-build-merger@google.com> 1513867733 +0000

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

Change-Id: Idc53c3825af7ad5193f496576d289877a51edd29