Merge "Update Settings redlines per UX request" into lmp-preview-dev

author Fabrice Di Meglio <fdimeglio@google.com>

Wed, 11 Jun 2014 02:41:53 +0000 (02:41 +0000)

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

Tue, 10 Jun 2014 22:18:15 +0000 (22:18 +0000)
author Fabrice Di Meglio <fdimeglio@google.com>
Wed, 11 Jun 2014 02:41:53 +0000 (02:41 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 10 Jun 2014 22:18:15 +0000 (22:18 +0000)
diff --cc src/com/android/settings/SettingsActivity.java
Simple merge
author	Fabrice Di Meglio <fdimeglio@google.com>
	Wed, 11 Jun 2014 02:41:53 +0000 (02:41 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 10 Jun 2014 22:18:15 +0000 (22:18 +0000)