tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 85a77d2abef598099b1f64b9efd1af481f2f62fd
parent b65a90235e7d4fc3a2dbf68bb73ac323a88f1abc
author Tao Bao <tbao@google.com> 1440646727 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646727 +0000

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

* commit 'b65a90235e7d4fc3a2dbf68bb73ac323a88f1abc':