tree 3136b393812950303b9a67a4c9743cc9ec1683c6
parent 550bd340c36d33c1bc820a83f92e588421102e2b
parent 7ff339ea1b36d46439e9255364cd9a4b2e73719a
author Tao Bao <tbao@google.com> 1430940761 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430940761 +0000

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

* commit '7ff339ea1b36d46439e9255364cd9a4b2e73719a':
  uncrypt: Switch to C++