tree 500677af2c571ac6f43bbc1f5b4b24d52a68d7ec
parent 5391dfdb35221f782a4d0da29e31f4725dc507d3
parent 307eecfdc7dc73ce8f53f742e3c468e63b42f0e2
author Tao Bao <tbao@google.com> 1436914344 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436914344 +0000

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

* commit '307eecfdc7dc73ce8f53f742e3c468e63b42f0e2':
  recovery: Switch applypatch/ and updater/ to cpp.