tree e69d95fe4e282125295a9103f7c82517273c7728
parent 676b9396808ee409284b5a2fdd2aaa8b21f18e5d
parent 17cda674f34ff7cb4fae2c65fcc7c8e99e3d86d3
author Tao Bao <tbao@google.com> 1531241804 -0700
committer android-build-merger <android-build-merger@google.com> 1531241804 -0700

Merge "edify: Rename parse_string to ParseString and let it take std::string." am: 6b18eb706e
am: 17cda674f3

Change-Id: Ifc341348415c461cdb76e67900bb097520158551