| commit | 875b5c20a96d01f8613d2cb93dd528aa970d916e | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Fri Oct 17 18:59:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 17 18:59:31 2014 +0000 |
| tree | f202141a2c10d36e647325d7454216bb0c7e63cd | |
| parent | ca42022cf0c955c63b178330d6b72ce86915fb7c [diff] | |
| parent | 0f3e09cb9c5adbdae140694e519cf9a8b241f1ba [diff] |
am 0f3e09cb: resolved conflicts for merge of 7776871d to lmp-mr1-dev * commit '0f3e09cb9c5adbdae140694e519cf9a8b241f1ba': cryptfs: extra debugging around crypto blockdev dm-... errors.