| commit | 310818ff825d0c9c60e19ac3a7e29396b5737420 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 12 23:41:37 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 12 23:41:43 2017 +0000 |
| tree | b5e73354f2629be85fbc7f1a7ee7d43fd689af6b | |
| parent | 1835f076b3349741a0cc661675f304d23bfe6fe8 [diff] | |
| parent | df9d33e9039d8567ea82f67a76d95a7ae7ab8df8 [diff] |
Merge "strong fp lockout after 20 failed attempts" into oc-dev