fixing the merge

This commit is contained in:
Joe Bowser 2010-06-09 10:26:06 -07:00
commit bde54704d3

View File

@ -71,7 +71,7 @@ public class DroidGap extends Activity {
private CryptoHandler crypto;
private BrowserKey mKey;
private AudioHandler audio;
private Uri imageUri;
/** Called when the activity is first created. */