Eric House 3a1b39f827 more of the (conflicted) merge from android_branch. These may be ... changes I need to make to get what git produced to compile and so not what it included in the previous commit.		2012-12-18 06:36:30 -08:00
..
assets	new versions of dicts with checksums and descriptions	2012-09-08 10:08:39 -07:00
jni	Fix occasional infinite loop of devices sending and receiving the same	2012-11-13 21:25:03 -08:00
libs	merge in changes from the -gcm directory: GCM will be a feature of the	2012-11-02 05:35:31 -07:00
res	Merge branch 'android_branch' into android_groups	2012-12-18 06:35:07 -08:00
src/org/eehouse/android/xw4	more of the (conflicted) merge from android_branch. These may be	2012-12-18 06:36:30 -08:00
.gitignore	ignore new obj dir	2012-01-03 18:27:15 -08:00
AndroidManifest.xml	use preferred SDK-8 API to look for downloads directory, and wrap it	2012-12-05 07:32:11 -08:00
build.xml	make it possible to build without knowing the GCM sender ID.	2012-11-22 08:13:06 -08:00
build_unchecked.xml	version of build.xml modified to pass -xline to javac. For future use...	2010-11-05 05:06:04 -07:00
project.properties	use preferred SDK-8 API to look for downloads directory, and wrap it	2012-12-05 07:32:11 -08:00