| commit | 05efd16c46c6f5c607f4604fb2cf48b4ea430382 | [log] [tgz] |
|---|---|---|
| author | Edward Savage-Jones <edward.savage-jones@sonymobile.com> | Fri Oct 07 11:21:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 07 11:21:55 2016 +0000 |
| tree | 4f50497ca5fdd20885b7c88a249122f55e32c1b3 | |
| parent | 097ff2454523a4c5d8df6d9c9acf74de3427cf5d [diff] | |
| parent | d94cc681230cf437353d40c20cbe575feebb7037 [diff] |
Merge "Make PIN/password failed attempts dialog non-cancelable" am: 708543b5ff am: d94cc68123 Change-Id: I69df9317467dc48fdd0c39081fcd5a9e65d72cc1