Merge "Fixing restored icons sometimes dissapers." into ub-now-master

author Sunny Goyal <sunnygoyal@google.com>

Thu, 24 Jul 2014 20:19:31 +0000 (20:19 +0000)

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

Thu, 24 Jul 2014 15:36:09 +0000 (15:36 +0000)
author Sunny Goyal <sunnygoyal@google.com>
Thu, 24 Jul 2014 20:19:31 +0000 (20:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 24 Jul 2014 15:36:09 +0000 (15:36 +0000)
diff --cc src/com/android/launcher3/ShortcutInfo.java
Simple merge
author	Sunny Goyal <sunnygoyal@google.com>
	Thu, 24 Jul 2014 20:19:31 +0000 (20:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 24 Jul 2014 15:36:09 +0000 (15:36 +0000)