MED-
Signed-off-by: Omar Trigui <omar.nvidia.tr@hotmail.com>
Signed-off-by: Omar Trigui <omar.nvidia.tr@hotmail.com>
Merge branch 'DevFest' of https://github.com/kidager/test.git into
DevFest

Conflicts:
	MyNotes/bin/MyNotes.apk
	MyNotes/bin/R.txt
	MyNotes/bin/classes.dex
	MyNotes/bin/resources.ap_
	MyNotes/gen/android/support/v7/appcompat/R.java
	MyNotes/gen/tn/devfest/mynotes/R.java
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar

Signed-off-by: Omar Trigui <omar.nvidia.tr@hotmail.com>
Signed-off-by: Omar Trigui <omar.nvidia.tr@hotmail.com>
Merge remote-tracking branch 'origin/DevFest' into DevFest-Jacem

Conflicts:
	MyNotes/.gitignore
	MyNotes/bin/MyNotes.apk
	MyNotes/bin/R.txt
	MyNotes/bin/classes.dex
	MyNotes/bin/resources.ap_
	MyNotes/gen/android/support/v7/appcompat/R.java
	MyNotes/gen/tn/devfest/mynotes/R.java
	MyNotes/res/values/attrs.xml
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar

Signed-off-by: Jacem Chaieb <kidager@gmail.com>
Signed-off-by: Jacem Chaieb <kidager@gmail.com>