| commit | 3b9eaab01b34e46912643e91395aab5ecb1907f6 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Apr 24 07:13:25 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 24 07:13:25 2018 -0700 |
| tree | 0ebf95aba068209b6b1e6a2553fcd6c1110b1f63 | |
| parent | 83d85c8c8c4aa7e5bf5b476f39dd1514d5884e0f [diff] | |
| parent | bbb49941a1db226b6dfb12bb67dccc2c598e6fa2 [diff] |
Merge "Keyguard: Don't lock when phone process crashes" into pi-dev am: fd935d3a12 am: bbb49941a1 Change-Id: I0aa39501d5ca944204cb4afd83ff27b71ee6b199