OSDN Git Service

Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev
authorBo Zhu <bozhu@google.com>
Fri, 23 Mar 2018 15:44:56 +0000 (15:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Mar 2018 15:44:56 +0000 (15:44 +0000)
commit2e815c6e746a77485b7affe0dd1d21eb34c080dc
treebb2962cdabd45c7bfcef0a4f82d608253ad08dfb
parent545024f7f98545b3d309b138254500086e147284
parent9ec7026e924104acaee5cc5bac8888ae5452f3be
Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev
am: 9ec7026e92

Change-Id: I0026b0ef43e9918811591f416a370dff84254df4