Merge "FastBitmapDrawable can draw an icon badge (notification count)" into ub-launch...

author Tony Wickham <twickham@google.com>

Wed, 18 Jan 2017 22:36:17 +0000 (22:36 +0000)

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

Wed, 18 Jan 2017 22:36:17 +0000 (22:36 +0000)
author Tony Wickham <twickham@google.com>
Wed, 18 Jan 2017 22:36:17 +0000 (22:36 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 18 Jan 2017 22:36:17 +0000 (22:36 +0000)
diff --cc src/com/android/launcher3/BubbleTextView.java
Simple merge
diff --cc src/com/android/launcher3/Workspace.java
Simple merge
author	Tony Wickham <twickham@google.com>
	Wed, 18 Jan 2017 22:36:17 +0000 (22:36 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 18 Jan 2017 22:36:17 +0000 (22:36 +0000)
		1	2
src/com/android/launcher3/BubbleTextView.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Workspace.java	patch \|	diff1 \|	diff2 \|	blob \| history