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