tree 64a8c1e78aa282460aebf39d3f4147d00ffa0fcc
parent 7cf7e6ce4f146f2bcd3eefbe93d9cb5a301e0eff
parent 881063477374749b37134e0559e09e9cb39a050e
author Tao Bao <tbao@google.com> 1475648002 +0000
committer android-build-merger <android-build-merger@google.com> 1475648002 +0000

Merge "edify: Move State.script and State.errmsg to std::string."
am: 8810634773

Change-Id: Id8e786de6fe76287b598dfcfbf962eba5d9ebde2