tree a959a1cb19ea9b5b1f2b606a0b4a70cff9f8ed8f
parent 40c5ed303909c4df71037be3429aa1423e59585f
author Kenny Guy <kennyguy@google.com> 1404127831 +0100
committer Kenny Guy <kennyguy@google.com> 1404127831 +0100

Revert "Revert Cls stopping now-master running on googlefood"

This reverts commit 7bc272a11b701a32d2ed91277341c382cbd84aeb.

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

Change-Id: Id1fb2e1249e72658ce5477165c9bcacba9de2b04