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

* commit '25a67fde9fe5ebaeb79dbb3edf0fc4857adf5da2':
  uncrypt: Switch to C++
This commit is contained in:
Tao Bao
2015-05-07 09:00:12 +00:00
committed by Android Git Automerger

Diff Content Not Available