| commit | 33ac22827f46ce26b242a26ae2d0bcf2dfeeb968 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Tue Jun 05 04:58:49 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 05 04:58:49 2018 -0700 |
| tree | 8ca2b295e7898b46bd18bbef36e848f19522987b | |
| parent | af92336eedc51f64dc744ca79cf5a2399e4f47c4 [diff] | |
| parent | 6d79f4578377f0aaa34556fb9b45ccff7f809647 [diff] |
Merge "Crashing can not override Keyguard transit" into pi-dev am: 44121059dc am: 6d79f45783 Change-Id: I6d4daa349f03891fee1901fb5f5ff96096665f42