| commit | e73074e9a8aae67e1455c16b621ecbe3c03f0ecc | [log] [tgz] |
|---|---|---|
| author | Bo Zhu <bozhu@google.com> | Wed Apr 04 19:13:40 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 04 19:13:40 2018 +0000 |
| tree | c85ccecb8eb0633b3dbc2f8f469502bd358655e1 | |
| parent | e269a5ac62448c7ce65d7a5cdc0a1f15c3481462 [diff] | |
| parent | 76973437e9cb36eb60fb2a374366713307688136 [diff] |
Merge "Use Scrypt to hash long passwords in RecoverableKeyStore" into pi-dev