tree d7c35f13c6ace0875a8f43804b3c9499749e9779
parent 11342f78cf78fe10042feedcb4fc7390235ff347
parent 25a67fde9fe5ebaeb79dbb3edf0fc4857adf5da2
author Tao Bao <tbao@google.com> 1430989212 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430989212 +0000

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

* commit '25a67fde9fe5ebaeb79dbb3edf0fc4857adf5da2':
  uncrypt: Switch to C++