tree 1943b4ca669974ee1bb0f812f3d9f8eacfd7e4db
parent c02acadd9b4d8a9baf01554eb648a8ed5ef8b186
parent f2c9934c37ed396ed65f24f03be7ea2b94167b9f
author Bo Zhu <bozhu@google.com> 1544212781 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1544212781 +0000

Merge "Replace the native scrypt in SyntheticPasswordManager by android.security.Scrypt (try this again)"