tree bf33151ba5c0a0939c0e78f77c3cc762f600f7ce
parent f96b1ad27f1a27bd8ab0cedd35aff2dbf2495a33
parent 606726ba289583a67188d9448b220c2e3fae87d7
author Sunny Goyal <sunnygoyal@google.com> 1441386886 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441386886 +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