am e5ae0bfd: am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting...

author Jeff Brown <jeffbrown@google.com>

Wed, 13 Nov 2013 17:02:27 +0000 (09:02 -0800)

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

Wed, 13 Nov 2013 17:02:27 +0000 (09:02 -0800)
author Jeff Brown <jeffbrown@google.com>
Wed, 13 Nov 2013 17:02:27 +0000 (09:02 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 13 Nov 2013 17:02:27 +0000 (09:02 -0800)
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc packages/SystemUI/res/values/strings.xml
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
Simple merge
author	Jeff Brown <jeffbrown@google.com>
	Wed, 13 Nov 2013 17:02:27 +0000 (09:02 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 13 Nov 2013 17:02:27 +0000 (09:02 -0800)
		1	2
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java	patch \|	diff1 \|	diff2 \|	blob \| history