| commit | 921e3c31049dc53ee076a062597bad0fb29208a7 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Fri May 29 01:23:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 29 01:23:55 2015 +0000 |
| tree | d7ba7bf8a7e275cf164e245b928c7509d4a52728 | |
| parent | dfcaf473511ed1ca7195c5f5901c1f325b58d97a [diff] | |
| parent | 127ab1fc2d6eab382d4464bc1b5b6cbd30bbc6d1 [diff] |
am 127ab1fc: resolved conflicts for merge of 158e11d6 to mnc-dev-plus-aosp * commit '127ab1fc2d6eab382d4464bc1b5b6cbd30bbc6d1': Separate uncrypt into two modes