From 30d164851ac3d4e7397e010baa24a8e5cb0dc090 Mon Sep 17 00:00:00 2001
From: Joe Robinson <joe@lc8n.com>
Date: Tue, 15 Dec 2015 20:43:45 +0000
Subject: Migrate to IntelliJ format, also contains some minor logging changes
 and moved libraries

---
 app/build/intermediates/res/merged/debug/values/values.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 app/build/intermediates/res/merged/debug/values/values.xml

(limited to 'app/build/intermediates/res/merged/debug/values/values.xml')

diff --git a/app/build/intermediates/res/merged/debug/values/values.xml b/app/build/intermediates/res/merged/debug/values/values.xml
new file mode 100644
index 0000000..8428a22
--- /dev/null
+++ b/app/build/intermediates/res/merged/debug/values/values.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">up.org.je</string>
+    <string name="cancel">Cancel</string>
+    <string name="hello">Hello World, fileBrowser!</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="menu_settings">Settings</string>
+    <string name="title_activity_main">MainActivity</string>
+    <style name="LightTheme" parent="@android:style/Theme.Light">
+        <!-- Any customizations for your app running on pre-3.0 devices here -->
+    </style>
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3