Matthew Wong ba1ef7a38e Merge branch 'upstream' into webview ... Conflicts: app/build.gradle		2015-12-31 06:24:05 -05:00
..
src	Merge branch 'upstream' into webview	2015-12-31 06:24:05 -05:00
.gitignore	initial commit	2014-07-24 01:15:11 +01:00
app-debug.apk	version bump	2015-06-08 21:00:29 +02:00
app-release.apk	show the full category of the password	2015-08-12 22:33:48 +02:00
build.gradle	add always show dialog preference.	2015-12-30 01:18:42 -05:00
copyLibs.gradle	Some other Eclipse integration, modified AndroidManifest.xml to match build.gradle information (app version, sdk version)	2014-09-23 09:58:05 +02:00
proguard-rules.pro	fix release build crash	2015-07-21 15:40:04 -04:00