Merge "Fix a NPE where developer options page crash sometimes." into pi-dev am: d940a...

author android-build-team Robot <android-build-team-robot@google.com>

Tue, 1 May 2018 03:51:39 +0000 (20:51 -0700)

committer android-build-merger <android-build-merger@google.com>

Tue, 1 May 2018 03:51:39 +0000 (20:51 -0700)
author android-build-team Robot <android-build-team-robot@google.com>
Tue, 1 May 2018 03:51:39 +0000 (20:51 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 1 May 2018 03:51:39 +0000 (20:51 -0700)
diff --cc src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
Simple merge
author	android-build-team Robot <android-build-team-robot@google.com>
	Tue, 1 May 2018 03:51:39 +0000 (20:51 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 1 May 2018 03:51:39 +0000 (20:51 -0700)
		1	2
src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java	patch \|	diff1 \|	diff2 \|	blob \| history