tree 47a62ed3cf643578280ddb1982599ed8345dd071
parent f2853e27472728d3a24293ab4bfc445c74be6a15
parent 0bacbfd03c866b9078f86216e6786da91238ac91
author Tao Bao <tbao@google.com> 1436836308 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436836308 +0000

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

* commit '0bacbfd03c866b9078f86216e6786da91238ac91':
  recovery: Switch applypatch/ and updater/ to cpp.