tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 672e28efe5593f102315cde3460898ff5b92b530
parent 85afda17522e25637bab37bdff1c5ea56b7c7a51
author Tao Bao <tbao@google.com> 1440684836 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684836 +0000

am 85afda17: am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."

* commit '85afda17522e25637bab37bdff1c5ea56b7c7a51':