diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-01-19 17:57:53 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-01-19 17:57:53 -0800 |
| commit | 3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394 (patch) | |
| tree | 138459463090a88006035162b3886e483f21ce18 /res/values-large/integers.xml | |
| parent | 328cd16b9f5f084adc4e64a2744b2e424a2478fd (diff) | |
| parent | d5758b2ec0edfc257bab18dd7cab572e2e02dbbe (diff) | |
| download | dsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.tar.gz dsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.tar.bz2 dsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.zip | |
Merge branch 'master' into DLNA
Conflicts:
AndroidManifest.xml
Diffstat (limited to 'res/values-large/integers.xml')
| -rw-r--r-- | res/values-large/integers.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values-large/integers.xml b/res/values-large/integers.xml index 93883e2a..be82d55a 100644 --- a/res/values-large/integers.xml +++ b/res/values-large/integers.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="Grid.Columns">3</integer>
+ <integer name="TextDescriptionLength">10</integer>
</resources>
\ No newline at end of file |