Merge "Place the work profile badge in the correct bottom right (left for RTL) locati...

author Hyunyoung Song <hyunyoungs@google.com>

Fri, 15 May 2015 00:09:49 +0000 (00:09 +0000)

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

Fri, 15 May 2015 00:09:49 +0000 (00:09 +0000)
author Hyunyoung Song <hyunyoungs@google.com>
Fri, 15 May 2015 00:09:49 +0000 (00:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 15 May 2015 00:09:49 +0000 (00:09 +0000)
diff --cc res/values/dimens.xml
Simple merge
diff --cc src/com/android/launcher3/compat/AppWidgetManagerCompatV16.java
Simple merge
diff --cc src/com/android/launcher3/widget/WidgetsListAdapter.java
Simple merge
author	Hyunyoung Song <hyunyoungs@google.com>
	Fri, 15 May 2015 00:09:49 +0000 (00:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 15 May 2015 00:09:49 +0000 (00:09 +0000)
		1	2
res/values/dimens.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/compat/AppWidgetManagerCompatV16.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/widget/WidgetsListAdapter.java	patch \|	diff1 \|	diff2 \|	blob \| history