Eric House 41817d896c Merge branch 'android_branch' into android_translate ... # 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-08-25 06:39:14 -07:00
..
.gitignore	move several strings, including app name, NBS port, and url prefix, into generated	2015-08-03 04:55:59 -07:00
app_name.xml	up strings and changelog for new release	2015-08-25 05:24:58 -07:00
common_rsrc.xml	experimental option that puts invite url text into clipboard so user	2015-08-23 21:44:45 -07:00
strings.xml	remove duplicate strings (likely added by merge when I wasn't paying attention)	2015-08-24 07:17:50 -07:00
styles.xml	make paired buttons height fill their container, forcing them to be	2015-03-12 21:06:31 -07:00