| commit | 2880e0fc5fe0f485209c49f1a2474b6d6ad46148 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Jun 10 00:55:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 10 00:55:32 2015 +0000 |
| tree | 52c9656a519db81f1e6427025cab4141bb55bf8e | |
| parent | 2fd12979eac8987d4aaa89b56c508a710450c33d [diff] | |
| parent | 2cf180f6cc3275592f82a57ab98b72723937e0fb [diff] |
am 2cf180f6: Merge "Separate uncrypt into two modes" * commit '2cf180f6cc3275592f82a57ab98b72723937e0fb': Separate uncrypt into two modes