tree 0fb879a87e42edd4c34811ddd795b847ecaa8da0
parent 6398b88e897e83e2d396a1a0ea5b097fdf570339
parent 606726ba289583a67188d9448b220c2e3fae87d7
author Sunny Goyal <sunnygoyal@google.com> 1441300713 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441300713 +0000

am 606726ba: Merge "Preventing null pointer crash when opening a folder" into ub-launcher3-burnaby

* commit '606726ba289583a67188d9448b220c2e3fae87d7':
  Preventing null pointer crash when opening a folder