Merge "Start cleaning up percentage formatting in Settings." into lmp-dev

author Elliott Hughes <enh@google.com>

Mon, 8 Sep 2014 23:26:20 +0000 (23:26 +0000)

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

Mon, 8 Sep 2014 23:26:20 +0000 (23:26 +0000)
author Elliott Hughes <enh@google.com>
Mon, 8 Sep 2014 23:26:20 +0000 (23:26 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 8 Sep 2014 23:26:20 +0000 (23:26 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/Utils.java
Simple merge
author	Elliott Hughes <enh@google.com>
	Mon, 8 Sep 2014 23:26:20 +0000 (23:26 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 8 Sep 2014 23:26:20 +0000 (23:26 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/Utils.java	patch \|	diff1 \|	diff2 \|	blob \| history