Merge "Update summary for Recent Apps." into oc-dr1-dev am: d7fc071f48

author Doris Ling <dling@google.com>

Thu, 22 Jun 2017 21:34:40 +0000 (21:34 +0000)

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

Thu, 22 Jun 2017 21:34:40 +0000 (21:34 +0000)
author Doris Ling <dling@google.com>
Thu, 22 Jun 2017 21:34:40 +0000 (21:34 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 21:34:40 +0000 (21:34 +0000)
diff --cc src/com/android/settings/applications/RecentAppsPreferenceController.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
Simple merge
author	Doris Ling <dling@google.com>
	Thu, 22 Jun 2017 21:34:40 +0000 (21:34 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 22 Jun 2017 21:34:40 +0000 (21:34 +0000)
		1	2
src/com/android/settings/applications/RecentAppsPreferenceController.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history