tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 8e897953ac1fae625c21902c14ecc8244e87a566
parent 9da33c67655c5d113f75a1f493b51cfee86d298c
author Tao Bao <tbao@google.com> 1440684825 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684825 +0000

am 9da33c67: am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."

* commit '9da33c67655c5d113f75a1f493b51cfee86d298c':