tree 5f0fd807ccc0e843e0416a3f74eb3a955f111d60
parent 8d312ed601d15123a442d8227df901160083f2a7
parent 3e8d28b547cd75af3f77f38a7e2895d0dbd2e232
author Tao Bao <tbao@google.com> 1430941431 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430941431 +0000

am 3e8d28b5: uncrypt: Switch to C++

* commit '3e8d28b547cd75af3f77f38a7e2895d0dbd2e232':
  uncrypt: Switch to C++