| commit | f415298764ebb4669df10e8c22a59c395a0425e7 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Apr 27 17:40:52 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 27 17:40:56 2017 +0000 |
| tree | d214fb955942ace5eab7065f3aa47015ed849cfe | |
| parent | ff93a475a9a0b2679f471fc3948594c646508af0 [diff] | |
| parent | 735b71176fa26d0b4a9e4eec513d27c9da742289 [diff] |
Merge "Merge "Reduce scrypt time in synthetic password flow" into oc-dev am: 71e0fcbf2f" into oc-dev-plus-aosp