commit b423f726267635f6dfea55d9d612afa99ec8dc51
author linus_lee <llee@cyngn.com> Wed Sep 03 19:48:29 2014 -0700
committer linus_lee <llee@cyngn.com> Thu Nov 20 11:59:13 2014 -0800
tree c6e714dd07cca4ad8509df5e1fc053e9c13d561d
parent 32e9492d3d5d0fae297af88865cfc3cfc22e27c1

Eleven: lots of ui tweaks (fonts, padding, grid layout) and cancel tasks smarter

Change-Id: Ifffd2ef386c301d546d4182bc5c3bf303194021c

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 108994e..02f0614 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -194,4 +194,6 @@
     <string name="header_1_album">1 Album</string>
     <string name="header_n_albums"><xliff:g id="number">%d</xliff:g> Albums</string>
     <string name="header_5_plus_albums">5+ Albums</string>
+
+    <string name="combine_two_strings">%1$s | %2$s</string>
 </resources>