akwizgran d6a7e6d52c Resolve merge conflicts. ...

# Conflicts:
#   briar-android/build.gradle
#   briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java

2017-11-21 10:27:31 +00:00

..

libs

Notify Tor controller if Tor has crashed.

2017-06-23 14:57:00 +01:00

src/main

Change wake lock tag

2017-10-24 13:45:27 +02:00

.gitignore

Added .gitignore files for new modules.

2016-12-01 10:08:46 +00:00

build.gradle

Resolve merge conflicts.

2017-11-21 10:27:31 +00:00

proguard-rules.txt

Updated java.library.path.

2016-11-30 18:10:49 +00:00