Merge "Change themes" into gb-ub-photos-arches

author Your Name <jreck@google.com>

Tue, 4 Dec 2012 00:14:03 +0000 (16:14 -0800)

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

Tue, 4 Dec 2012 00:14:03 +0000 (16:14 -0800)
author Your Name <jreck@google.com>
Tue, 4 Dec 2012 00:14:03 +0000 (16:14 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 4 Dec 2012 00:14:03 +0000 (16:14 -0800)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/styles.xml
Simple merge
author	Your Name <jreck@google.com>
	Tue, 4 Dec 2012 00:14:03 +0000 (16:14 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 4 Dec 2012 00:14:03 +0000 (16:14 -0800)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/styles.xml	patch \|	diff1 \|	diff2 \|	blob \| history