Merge "Introduce MemoryUsagePreferenceController"

author Jeffrey Huang <jeffreyhuang@google.com>

Thu, 26 Oct 2017 16:51:07 +0000 (16:51 +0000)

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

Thu, 26 Oct 2017 16:51:07 +0000 (16:51 +0000)
author Jeffrey Huang <jeffreyhuang@google.com>
Thu, 26 Oct 2017 16:51:07 +0000 (16:51 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 26 Oct 2017 16:51:07 +0000 (16:51 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
Simple merge
author	Jeffrey Huang <jeffreyhuang@google.com>
	Thu, 26 Oct 2017 16:51:07 +0000 (16:51 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 26 Oct 2017 16:51:07 +0000 (16:51 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java	patch \|	diff1 \|	diff2 \|	blob \| history