| commit | 38ca6da89d4e96cc819114b81e02196c1d7034b2 | [log] [tgz] |
|---|---|---|
| author | Wale Ogunwale <ogunwale@google.com> | Mon Sep 12 23:28:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Sep 12 23:28:06 2016 +0000 |
| tree | 135641d672f398eabded4709aedf2091a075c0ca | |
| parent | 8a4c3c956a6eba69d129f3c52f16bd45e3884fd7 [diff] | |
| parent | 8298dae9f7fd6a9776a4f04e85cec095b4051c10 [diff] |
Merge "Don't try to show crash dialog if lock screen is showing." into nyc-mr1-dev am: cb443c529b am: 8298dae9f7 Change-Id: Id98a4867e8cf3cc172375d54e188bb7c7eb29667