| commit | d375476bda6226ce4c8ad57671114a7320161559 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Wed Sep 06 12:27:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 06 12:27:42 2017 +0000 |
| tree | 819bc57d90d2d64517fe76cfc37dfbccd32caca6 | |
| parent | 3d6e6a63e9ab8b11a56bf103e112713599534d06 [diff] | |
| parent | c17f1d412b682ee12f30bc77b3b5275a5898fc7e [diff] |
Merge "Fix resetPasswordWithToken before user unlock" into oc-mr1-dev am: 2e21fba2b5 am: c17f1d412b Change-Id: If147939b9c74803ca2c6177e770736b0e82fdc96