tree c665b140de400e49052b7e0b3a92534087316195
parent c4d91f0bbf9b3e85e227baf0d987ba904eefbf31
parent d7007923c55994d64514706b212fa3e8c1a3b25f
author Hall Liu <hallliu@google.com> 1464741219 +0000
committer android-build-merger <android-build-merger@google.com> 1464741219 +0000

Merge "Add null check in showLockTaskToast" into nyc-dev
am: d7007923c5

* commit 'd7007923c55994d64514706b212fa3e8c1a3b25f':
  Add null check in showLockTaskToast

Change-Id: Ieba238cbc0cc0ae36ec6cab942cbe98e55600fcb