Eric House f45cafad29 Merge branch 'android_branch' into relay_noconn ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.		2015-07-31 07:05:39 -07:00
..
archive	change button text to Wait (per Kati)	2015-07-30 06:36:47 -07:00
assets	wrap email in changes log in a mailto url	2015-06-15 07:49:59 -07:00
img_src	get rid of send-invitation menuitem, since it's never there unless	2015-01-24 16:32:11 -08:00
jni	use different uuid for dbg variant so it's not cross-sending BT	2015-07-29 19:48:56 -07: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	change button text to Wait (per Kati)	2015-07-30 06:36:47 -07:00
res_src	change button text to Wait (per Kati)	2015-07-30 06:36:47 -07:00
src/org/eehouse/android/xw4	Merge branch 'android_branch' into relay_noconn	2015-07-31 07:05:39 -07:00
.gitignore	adding file required for proguard	2014-07-14 21:46:09 -07:00
AndroidManifest.xml	use common/native NetLaunchInfo to implement invite-via-relay that	2015-07-10 23:19:38 -07:00
build.xml	up client version. There are no protocol-related changes to require	2015-06-06 11:53:43 -07: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
proguard-project.txt	adding file required for proguard	2014-07-14 21:46:09 -07:00
project.properties	turn proguard back Off. Will get it working on another branch.	2014-07-14 22:37:10 -07:00