commit 2d424857cc594b423b29556aa8c68cfc409ed91c
author Scott Kennedy <skennedy@google.com> Fri Oct 18 14:00:37 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 18 14:00:37 2013 -0700
tree 04c2b27521fb0a1add6d3b921a34f9c4ae42daaf
parent 84ba9d0a3a2bc440f963f806a0e5395b53f27b3b
parent 5ae12c5001d02f80014d0c35653e2a9fbd5d33e2

am 5dab3464: Don\'t translate "Chips Sample"

* commit '5dab3464860a47cca5dce934dd184dc0f02a58ed':
  Don't translate "Chips Sample"

sample/res/values/strings.xml

diff --git a/sample/res/values/strings.xml b/sample/res/values/strings.xml
index c765231..a40b20d 100644
--- a/sample/res/values/strings.xml
+++ b/sample/res/values/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources>
 
-    <string name="app_name">Chips Sample</string>
+    <string name="app_name" translatable="false">Chips Sample</string>
     <string name="email_addresses">Email Addresses</string>
     <string name="phone_numbers">Phone Numbers</string>