Merge "Fix bug #16703191 APN settings shows back button even when you intent into...

author Fabrice Di Meglio <fdimeglio@google.com>

Fri, 15 Aug 2014 18:37:33 +0000 (18:37 +0000)

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

Fri, 15 Aug 2014 04:37:53 +0000 (04:37 +0000)
author Fabrice Di Meglio <fdimeglio@google.com>
Fri, 15 Aug 2014 18:37:33 +0000 (18:37 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 15 Aug 2014 04:37:53 +0000 (04:37 +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>
	Fri, 15 Aug 2014 18:37:33 +0000 (18:37 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 15 Aug 2014 04:37:53 +0000 (04:37 +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