OSDN Git Service

Merge "Add null check in showLockTaskToast" into nyc-dev
authorHall Liu <hallliu@google.com>
Wed, 1 Jun 2016 00:33:39 +0000 (00:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Jun 2016 00:33:39 +0000 (00:33 +0000)
commit561df62a523fdc78616db66b6f24ac7b10f57eb9
treec665b140de400e49052b7e0b3a92534087316195
parentc4d91f0bbf9b3e85e227baf0d987ba904eefbf31
parentd7007923c55994d64514706b212fa3e8c1a3b25f
Merge "Add null check in showLockTaskToast" into nyc-dev
am: d7007923c5

* commit 'd7007923c55994d64514706b212fa3e8c1a3b25f':
  Add null check in showLockTaskToast

Change-Id: Ieba238cbc0cc0ae36ec6cab942cbe98e55600fcb