search and sort
Merge remote-tracking branch 'choose_remote_name/master' into
experiment_usg

Conflicts:
	.classpath
	jni/Android.mk
	jni/method.cpp
	libs/armeabi-v7a/libmixed_sample.so
	obj/local/armeabi-v7a/libmixed_sample.so
	obj/local/armeabi-v7a/objs/mixed_sample/jni_part.o
	obj/local/armeabi-v7a/objs/mixed_sample/jni_part.o.d
	obj/local/armeabi-v7a/objs/mixed_sample/method.o
	obj/local/armeabi-v7a/objs/mixed_sample/method.o.d
	project.properties
	src/id/fruity/usg/LoginActivity.java
	src/id/fruity/usg/PatientListActivity.java
Fix build properties after merge