{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\margl1440\margr1440\vieww23420\viewh11600\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

\f0\fs24 \cf0 Only in /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android: .DS_Store\
Common subdirectories: /Users/emerriman/Documents/pullTesting/build/android/assets and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/assets\
Common subdirectories: /Users/emerriman/Documents/pullTesting/build/android/bin and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin\
Common subdirectories: /Users/emerriman/Documents/pullTesting/build/android/gen and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/gen\
Common subdirectories: /Users/emerriman/Documents/pullTesting/build/android/lib and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/lib\
Common subdirectories: /Users/emerriman/Documents/pullTesting/build/android/res and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/res\
Common subdirectories: /Users/emerriman/Documents/pullTesting/build/android/src and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/src\
emerriman-MBP:~ emerriman$ diff -r /Users/emerriman/Documents/pullTesting/build/android /Users/emerriman/Documents/Titanium\\ Studio\\ Workspace/pullTesting/build/android \
Only in /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android: .DS_Store\
Binary files /Users/emerriman/Documents/pullTesting/build/android/bin/app-unsigned.apk and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/app-unsigned.apk differ\
Binary files /Users/emerriman/Documents/pullTesting/build/android/bin/app.ap_ and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/app.ap_ differ\
Binary files /Users/emerriman/Documents/pullTesting/build/android/bin/app.apk and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/app.apk differ\
diff -r /Users/emerriman/Documents/pullTesting/build/android/bin/build_info.json /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/build_info.json\
1c1\
< \{"include_all_modules": true\}\
\\ No newline at end of file\
---\
> \{"include_all_modules": false\}\
\\ No newline at end of file\
Binary files /Users/emerriman/Documents/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/PulltestingAppInfo.class and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/PulltestingAppInfo.class differ\
Binary files /Users/emerriman/Documents/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/PulltestingApplication.class and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/PulltestingApplication.class differ\
Binary files /Users/emerriman/Documents/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/R$drawable.class and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/R$drawable.class differ\
Binary files /Users/emerriman/Documents/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/R$layout.class and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/R$layout.class differ\
Binary files /Users/emerriman/Documents/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/R$string.class and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/R$string.class differ\
Binary files /Users/emerriman/Documents/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/R$style.class and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/R$style.class differ\
Binary files /Users/emerriman/Documents/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/R.class and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/classes/com/appcelerator/testingyay/R.class differ\
Binary files /Users/emerriman/Documents/pullTesting/build/android/bin/classes.dex and /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/bin/classes.dex differ\
diff -r /Users/emerriman/Documents/pullTesting/build/android/gen/com/appcelerator/testingyay/PulltestingAppInfo.java /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/gen/com/appcelerator/testingyay/PulltestingAppInfo.java\
19c19\
< 					properties.setString("ti.deploytype", "development");\
---\
> 					properties.setString("ti.deploytype", "test");\
diff -r /Users/emerriman/Documents/pullTesting/build/android/gen/com/appcelerator/testingyay/PulltestingApplication.java /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/gen/com/appcelerator/testingyay/PulltestingApplication.java\
36c36\
< 		 		 		 		 		 		 		 		 		 		 	 \
---\
> 		 		 		 		 		 		 		 		 		 \
42,43d41\
< 		// Geolocation module\
< 		modules.add(new ti.modules.titanium.geolocation.GeolocationModule(context));\
45a44,45\
> 		// Media module\
> 		modules.add(new ti.modules.titanium.media.MediaModule(context));\
48,57d47\
< 		// API module\
< 		modules.add(new ti.modules.titanium.api.APIModule(context));\
< 		// XML module\
< 		modules.add(new ti.modules.titanium.xml.XMLModule(context));\
< 		// Network module\
< 		modules.add(new ti.modules.titanium.network.NetworkModule(context));\
< 		// Accelerometer module\
< 		modules.add(new ti.modules.titanium.accelerometer.AccelerometerModule(context));\
< 		// Contacts module\
< 		modules.add(new ti.modules.titanium.contacts.ContactsModule(context));\
60,63d49\
< 		// Media module\
< 		modules.add(new ti.modules.titanium.media.MediaModule(context));\
< 		// Platform module\
< 		modules.add(new ti.modules.titanium.platform.PlatformModule(context));\
66,79c52,53\
< 		// Android module\
< 		modules.add(new ti.modules.titanium.android.AndroidModule(context));\
< 		// Android.Calendar\
< 		KrollModule.addExternalChildModule(ti.modules.titanium.android.AndroidModule.class, ti.modules.titanium.android.calendar.CalendarModule.class);\
< 		// Utils module\
< 		modules.add(new ti.modules.titanium.utils.UtilsModule(context));\
< 		// Map module\
< 		modules.add(new ti.modules.titanium.map.MapModule(context));\
< 		// Yahoo module\
< 		modules.add(new ti.modules.titanium.yahoo.YahooModule(context));\
< 		// Facebook module\
< 		modules.add(new ti.modules.titanium.facebook.FacebookModule(context));\
< 		// Database module\
< 		modules.add(new ti.modules.titanium.database.DatabaseModule(context));\
---\
> 		// API module\
> 		modules.add(new ti.modules.titanium.api.APIModule(context));\
84,85c58,59\
< 		// Gesture module\
< 		modules.add(new ti.modules.titanium.gesture.GestureModule(context));\
---\
> 		// Android module\
> 		modules.add(new ti.modules.titanium.android.AndroidModule(context));\
diff -r /Users/emerriman/Documents/pullTesting/build/android/gen/com/appcelerator/testingyay/R.java /Users/emerriman/Documents/Titanium Studio Workspace/pullTesting/build/android/gen/com/appcelerator/testingyay/R.java\
16,23d15\
<         public static final int default_d44e27d97b=0x7f020002;\
<         public static final int facebook_icon=0x7f020003;\
<         public static final int facebook_login=0x7f020004;\
<         public static final int facebook_login_down=0x7f020005;\
<         public static final int facebook_login_wide=0x7f020006;\
<         public static final int facebook_login_wide_down=0x7f020007;\
<         public static final int facebook_logout=0x7f020008;\
<         public static final int facebook_logout_down=0x7f020009;\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable: facebook_icon.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable: facebook_login.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable: facebook_login_down.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable: facebook_login_wide.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable: facebook_login_wide_down.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable: facebook_logout.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable: facebook_logout_down.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res: drawable-hdpi\
Only in /Users/emerriman/Documents/pullTesting/build/android/res: drawable-ldpi\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable-long-land-hdpi: default_d44e27d97b.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable-long-land-ldpi: default_d44e27d97b.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable-long-port-hdpi: default_d44e27d97b.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable-long-port-ldpi: default_d44e27d97b.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable-notlong-land-hdpi: default_d44e27d97b.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable-notlong-land-ldpi: default_d44e27d97b.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable-notlong-land-mdpi: default_d44e27d97b.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable-notlong-port-hdpi: default_d44e27d97b.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable-notlong-port-ldpi: default_d44e27d97b.png\
Only in /Users/emerriman/Documents/pullTesting/build/android/res/drawable-notlong-port-mdpi: default_d44e27d97b.png\
}