tree 576ea15da50d8081d937a15b194b675f0f221057
parent 4b7ed5a71be808a9954bf5cda201ffe998c943b9
parent 80ccac2fffc09ef0b8a1fe43c096788e12359a1d
author Elliott Hughes <enh@google.com> 1513836868 +0000
committer android-build-merger <android-build-merger@google.com> 1513836868 +0000

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

Change-Id: Ife18e431247a479cb038f21f92ad0b687a9509b8