tree 57d13940b2ca1bef9834f236323079dd1fbad7d5
parent 485b63702c312bf47a1fd4821fde7dcade41e09d
parent 4824827340cc76927f8b24d000638624b15021ac
author Tao Bao <tbao@google.com> 1436906499 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436906499 +0000

am 48248273: am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."

* commit '4824827340cc76927f8b24d000638624b15021ac':
  recovery: Switch applypatch/ and updater/ to cpp.