Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev

am: 84ab40cab2

* commit '84ab40cab243ac76a83c3d15478699998ba68236':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal
2015-10-21 17:04:18 +00:00
committed by android-build-merger

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="5379477904423203699">"Localização combinada"</string>
</resources>