Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_L...

author Fabrice Di Meglio <fdimeglio@google.com>

Thu, 24 Jul 2014 21:22:06 +0000 (21:22 +0000)

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

Thu, 24 Jul 2014 15:36:02 +0000 (15:36 +0000)
author Fabrice Di Meglio <fdimeglio@google.com>
Thu, 24 Jul 2014 21:22:06 +0000 (21:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 24 Jul 2014 15:36:02 +0000 (15:36 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc src/com/android/settings/Settings.java
Simple merge
diff --cc src/com/android/settings/SettingsActivity.java
Simple merge
author	Fabrice Di Meglio <fdimeglio@google.com>
	Thu, 24 Jul 2014 21:22:06 +0000 (21:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 24 Jul 2014 15:36:02 +0000 (15:36 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/SettingsActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history