| commit | f8567234e0bff5f9efbda595fdf345b468002ad1 | [log] [tgz] |
|---|---|---|
| author | Kevin Chyn <kchyn@google.com> | Sat May 13 00:03:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat May 13 00:03:18 2017 +0000 |
| tree | f2d2118b331a97ec8fa2bbf09e117f4e1fef1d23 | |
| parent | c876ebe70b0eb56cc9fe5cd70037d39863b1f2f2 [diff] | |
| parent | 3ed8955aa35c48ffc29e07d6e749d26a419f630c [diff] |
Merge "strong fp lockout after 20 failed attempts" into oc-dev am: 310818ff82 am: 3ed8955aa3 Change-Id: Id8de8c421f31faa6ec30a8bd1e8d5d2585642363