tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent f0e341b44949564de0d33361c1284b8aff19a8bd
parent 3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f
author Tao Bao <tbao@google.com> 1440646703 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646703 +0000

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

* commit '3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f':