tree e69d95fe4e282125295a9103f7c82517273c7728
parent 6f60263d5ee8008d2f611cb6c49d7b70d0077431
parent edaf0dad556c93f21f3f0835886f11b9c86d7a48
author Tao Bao <tbao@google.com> 1531242729 -0700
committer android-build-merger <android-build-merger@google.com> 1531242729 -0700

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

Change-Id: If78f707596f24de6f6de622ebd1d7434e19b5822