Merge "Fix a crash when launching app detail for bad package name" am: ada1a39ffb...

author Fan Zhang <zhfan@google.com>

Wed, 12 Sep 2018 01:53:09 +0000 (18:53 -0700)

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

Wed, 12 Sep 2018 01:53:09 +0000 (18:53 -0700)
author Fan Zhang <zhfan@google.com>
Wed, 12 Sep 2018 01:53:09 +0000 (18:53 -0700)
committer android-build-merger <android-build-merger@google.com>
Wed, 12 Sep 2018 01:53:09 +0000 (18:53 -0700)
diff --cc src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
Simple merge
author	Fan Zhang <zhfan@google.com>
	Wed, 12 Sep 2018 01:53:09 +0000 (18:53 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 12 Sep 2018 01:53:09 +0000 (18:53 -0700)
		1	2
src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java	patch \|	diff1 \|	diff2 \|	blob \| history