| commit | d94cc681230cf437353d40c20cbe575feebb7037 | [log] [tgz] |
|---|---|---|
| author | Edward Savage-Jones <edward.savage-jones@sonymobile.com> | Fri Oct 07 11:17:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 07 11:17:49 2016 +0000 |
| tree | 780e019e5bfb57d354f4d4213febb3bbf0f3d6e6 | |
| parent | 3c6b4961cb8092659c409dd9887a2d0543c040c1 [diff] | |
| parent | 708543b5ffc01218dea70a25b6b7ee010de5d859 [diff] |
Merge "Make PIN/password failed attempts dialog non-cancelable" am: 708543b5ff Change-Id: I2a95bd2a53f3ef73f63b6d955528cb16dbd4de10