tree d7c35f13c6ace0875a8f43804b3c9499749e9779
parent 020bdab2bedfc1bddd493fd3e0491595a3785726
parent 92a13f5697228c6460bf740ccce4021b8a5e0bc8
author Tao Bao <tbao@google.com> 1431018966 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431018966 +0000

am 92a13f56: am 25a67fde: am 7ff339ea: Merge "uncrypt: Switch to C++"

* commit '92a13f5697228c6460bf740ccce4021b8a5e0bc8':
  uncrypt: Switch to C++