Graduate to a rebased and gradle world.

This commit is contained in:
Moxie Marlinspike
2013-10-12 03:09:22 -07:00
parent 2d083208cc
commit 1ac32346c1
5 changed files with 49 additions and 4 deletions

View File

@@ -27,7 +27,7 @@ import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.whispersystems.textsecure.crypto.MasterSecret;
/**
* Activity that displays the local identity key and offers the option to regenerate it.