Commit 64704663 authored Sep 04, 2015 by Sunny Goyal Committed by Android Git Automerger Sep 04, 2015

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

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

src/com/android/launcher3/Workspace.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -4089,7 +4089,7 @@ public class Workspace extends PagedView

		@Override
		public boolean evaluate(ItemInfo info, View v, View parent) {
		return info.id == id;
		return info != null && info.id == id;
		}
		});
		}