Matan Bar Yosef a3525d06d0 Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android ... # Conflicts: # app/src/main/AndroidManifest.xml - splash screen added and modified		2016-07-03 14:33:02 +03:00
..
animated_vector_drawable_23_3_0.xml	fix to geodecoder crash	2016-07-03 12:51:51 +03:00
appcompat_v7_23_3_0.xml	fix to geodecoder crash	2016-07-03 12:51:51 +03:00
design_23_3_0.xml	fix to geodecoder crash	2016-07-03 12:51:51 +03:00
hamcrest_core_1_3.xml	Bare Android Project	2016-07-01 14:11:36 +03:00
junit_4_12.xml	Bare Android Project	2016-07-01 14:11:36 +03:00
recyclerview_v7_23_3_0.xml	fix to geodecoder crash	2016-07-03 12:51:51 +03:00
support_annotations_23_3_0.xml	fix to geodecoder crash	2016-07-03 12:51:51 +03:00
support_v4_23_3_0.xml	fix to geodecoder crash	2016-07-03 12:51:51 +03:00
support_vector_drawable_23_3_0.xml	fix to geodecoder crash	2016-07-03 12:51:51 +03:00
volley_1_0_0.xml	fix to geodecoder crash	2016-07-03 12:51:51 +03:00