tree 91e52ac911ec8051355512da34897dfb39513edb
parent b0a0765ac0169e3f59f27f3474b5d64bdc620249
parent a42b283028660f5e9feb902555e9e76d3104d1f5
author Sunny Goyal <sunnygoyal@google.com> 1470158278 +0000
committer android-build-merger <android-build-merger@google.com> 1470158278 +0000

Merge "Handling IllegalStateException which can be thrown by the system when the user is locked" into ub-launcher3-calgary
am: a42b283028

Change-Id: I4ecf1e8540e23210117ad71977535e45aa9d3558