tree 52c9656a519db81f1e6427025cab4141bb55bf8e
parent 2fd12979eac8987d4aaa89b56c508a710450c33d
parent 2cf180f6cc3275592f82a57ab98b72723937e0fb
author Tao Bao <tbao@google.com> 1433897732 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433897732 +0000

am 2cf180f6: Merge "Separate uncrypt into two modes"

* commit '2cf180f6cc3275592f82a57ab98b72723937e0fb':
  Separate uncrypt into two modes