commit | d23d0d1b7c7e87cd6560398fd2ea3494d29a0c9f | [log] [tgz] |
---|---|---|
author | Wale Ogunwale <ogunwale@google.com> | Wed Sep 14 06:30:39 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 14 06:30:39 2016 +0000 |
tree | 37b471f865c3ccf2cfa6817634522dcfd422965c | |
parent | c5e62691fb8b99f7f238503c6396e5cfd33a708c [diff] | |
parent | 38ca6da89d4e96cc819114b81e02196c1d7034b2 [diff] |
Merge "Don't try to show crash dialog if lock screen is showing." into nyc-mr1-dev am: cb443c529b am: 8298dae9f7 am: 38ca6da89d Change-Id: I42796344ac0811202760e482e4d6c795477208ea