Merge "Second try removing orphaned items from the database" into ub-now-nova

author Adam Cohen <adamcohen@google.com>

Wed, 23 Apr 2014 18:21:15 +0000 (18:21 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 23 Apr 2014 18:21:15 +0000 (18:21 +0000)
author Adam Cohen <adamcohen@google.com>
Wed, 23 Apr 2014 18:21:15 +0000 (18:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 23 Apr 2014 18:21:15 +0000 (18:21 +0000)
diff --cc src/com/android/launcher3/LauncherProvider.java
Simple merge
author	Adam Cohen <adamcohen@google.com>
	Wed, 23 Apr 2014 18:21:15 +0000 (18:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 23 Apr 2014 18:21:15 +0000 (18:21 +0000)