am a0b5ab0e: am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue...

author Dianne Hackborn <hackbod@google.com>

Thu, 13 Aug 2015 02:10:09 +0000 (02:10 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 13 Aug 2015 02:10:09 +0000 (02:10 +0000)
author Dianne Hackborn <hackbod@google.com>
Thu, 13 Aug 2015 02:10:09 +0000 (02:10 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 13 Aug 2015 02:10:09 +0000 (02:10 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/DeviceInfoSettings.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Thu, 13 Aug 2015 02:10:09 +0000 (02:10 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 13 Aug 2015 02:10:09 +0000 (02:10 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/DeviceInfoSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history