tree e7fa8a1f424d648ddb41d7d5d73186eeba55e5f6
parent 2996d6a6e6a3c525df1f366447a8bdc927d20038
parent 647046637efc2b7414b15062cc650cb690c01f46
author Sunny Goyal <sunnygoyal@google.com> 1441843694 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441843694 +0000

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

* commit '647046637efc2b7414b15062cc650cb690c01f46':