| commit | 5a1aa4c789335d1750a421ea5244663d20438cea | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Jun 10 01:42:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 10 01:42:11 2015 +0000 |
| tree | 5999b4abeaa280a75a2b8eb67a301b3d1739bac2 | |
| parent | 9df159da877cad258dea99d7c2d24ced3797ff40 [diff] | |
| parent | 2880e0fc5fe0f485209c49f1a2474b6d6ad46148 [diff] |
am 2880e0fc: (-s ours) am 2cf180f6: Merge "Separate uncrypt into two modes" * commit '2880e0fc5fe0f485209c49f1a2474b6d6ad46148': Separate uncrypt into two modes