| commit | 50c673660ef54242bcaefbf838e40d54bdaf6e84 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Thu Nov 20 10:49:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 20 10:49:27 2014 +0000 |
| tree | 92a583213f5523622d26008b2e8e598c75cd0c2b | |
| parent | 4a0d6f3e1196a545d56337e2934b273d7d0655a6 [diff] | |
| parent | 67b4af148db7638ba6fb9ed84efb258f6c7e1c88 [diff] |
am 67b4af14: Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev * commit '67b4af148db7638ba6fb9ed84efb258f6c7e1c88': Prevent factory reset for short passwords in CryptKeeper