OSDN Git Service

Merge "Minor changes to the API to align the choice of password hashing algorithm...
authorBo Zhu <bozhu@google.com>
Tue, 20 Mar 2018 23:11:22 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Mar 2018 23:11:22 +0000 (23:11 +0000)
am: cb686a19e6

Change-Id: I762ca84a7a3f87a729fb38c5182bfd8a4e82d826


Trivial merge