tree 91e52ac911ec8051355512da34897dfb39513edb
parent 73a0a726a693f1fad04df012bef0ac5c5f56cdea
parent 49f4f03dc8ed3925e80d379634e43eb24eea25b9
author Sunny Goyal <sunnygoyal@google.com> 1470157484 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1470157484 +0000

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