tree bf579ed887938e33abc935e07712480ac6700ccc
parent 0467a905cc488cc1f28886e3978a49fd09c291c1
parent 6674f22a2f979ad71933d353f37743c4987c8d00
author Tao Bao <tbao@google.com> 1475648182 +0000
committer android-build-merger <android-build-merger@google.com> 1475648182 +0000

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

Change-Id: I7da4df259a8155fbdab6e696fab4ddfb45cb0fbc