From c2bd8101b8e26b9ebb2c079ae6867229dad3f196 Mon Sep 17 00:00:00 2001
From: Kenny Guy <kennyguy@google.com>
Date: Mon, 30 Jun 2014 12:30:31 +0100
Subject: Revert "Revert Cls stopping now-master running on googlefood"

This reverts commit 7bc272a11b701a32d2ed91277341c382cbd84aeb.

Conflicts:
	src/com/android/launcher3/BubbleTextView.java

Change-Id: Id1fb2e1249e72658ce5477165c9bcacba9de2b04
---
 src/com/android/launcher3/ShortcutInfo.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/com/android/launcher3/ShortcutInfo.java')

diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java
index a84a90354..d2573a4a1 100644
--- a/src/com/android/launcher3/ShortcutInfo.java
+++ b/src/com/android/launcher3/ShortcutInfo.java
@@ -119,10 +119,12 @@ public class ShortcutInfo extends ItemInfo {
         }
     }
 
-    ShortcutInfo(Intent intent, CharSequence title, Bitmap icon, UserHandleCompat user) {
+    ShortcutInfo(Intent intent, CharSequence title, String contentDescrition,
+            Bitmap icon, UserHandleCompat user) {
         this();
         this.intent = intent;
         this.title = title;
+        this.contentDescription = contentDescription;
         mIcon = icon;
         this.user = user;
     }
-- 
cgit v1.2.3