Commit 2ed6e988 authored Feb 06, 2020 by Hongwei Wang

Merging from ub-launcher3-master @ build 6188107

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6188107.html

Change-Id: I32199dfedce8e3e22bfbf9579fee2930d84f4cbd

parents 22c74a9a dc4dfc67

robolectric_tests/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ LOCAL_JAVA_LIBRARIES := \

		LOCAL_TEST_PACKAGE := ThemePicker

		LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src \
		LOCAL_INSTRUMENT_SOURCE_DIRS := packages/apps/ThemePicker/src \

		LOCAL_ROBOTEST_TIMEOUT := 36000