commit | 437939f56e4968461f25caa65f8ed04434d482f0 | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Mon Jun 01 15:58:47 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 15:58:47 2015 +0000 |
tree | b11de96f03aeae97ac4fd188f25a2c08c0fe85bc | |
parent | 74a28d5f6d7567d0ac4b26ec6c6020b8fbb8f571 [diff] | |
parent | 9cea1138cf40bdbbb3ca93b0c82eaca360c7e3b5 [diff] |
am 9cea1138: (-s ours) am b7f0702e: (-s ours) DO NOT MERGE Use default key permissions for ext4enc * commit '9cea1138cf40bdbbb3ca93b0c82eaca360c7e3b5': DO NOT MERGE Use default key permissions for ext4enc DO NOT MERGE Simplify password checking logic