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/menu/menu.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 app/build/intermediates/res/merged/debug/menu/menu.xml

(limited to 'app/build/intermediates/res/merged/debug/menu')

diff --git a/app/build/intermediates/res/merged/debug/menu/menu.xml b/app/build/intermediates/res/merged/debug/menu/menu.xml
new file mode 100644
index 0000000..1d60246
--- /dev/null
+++ b/app/build/intermediates/res/merged/debug/menu/menu.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:id="@+id/menuBrowse"
+	  android:icon="@android:drawable/ic_menu_upload"
+	  android:title="Upload Files"></item>
+<item android:id="@+id/menuRecord"
+	  android:icon="@android:drawable/ic_btn_speak_now"
+	  android:title="Record Audio"></item>
+<item android:id="@+id/menuLocate"
+	  android:icon="@android:drawable/ic_menu_compass"
+	  android:title="Send Location"></item>
+<item android:id="@+id/menuExit"
+	  android:icon="@android:drawable/ic_menu_close_clear_cancel"
+	  android:title="Exit"></item>
+</menu>
-- 
cgit v1.2.3