| commit | e6f8904cd108feedf015d55bc3d0b52f312a0903 | [log] [tgz] |
|---|---|---|
| author | Edward Savage-Jones <edward.savage-jones@sonymobile.com> | Fri Oct 07 11:29:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 07 11:29:51 2016 +0000 |
| tree | 4589dabe136c954bc68e9e6d3d0bc14992ddf52f | |
| parent | 0189359870d22a02eb99cb304a94113b62295105 [diff] | |
| parent | 05efd16c46c6f5c607f4604fb2cf48b4ea430382 [diff] |
Merge "Make PIN/password failed attempts dialog non-cancelable" am: 708543b5ff am: d94cc68123 am: 05efd16c46 Change-Id: Ife64f5db81028f665101d434cd6345ed8dac2d7c