mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-26 12:03:28 +08:00
fixing the merge
This commit is contained in:
commit
bde54704d3
@ -71,7 +71,7 @@ public class DroidGap extends Activity {
|
|||||||
private CryptoHandler crypto;
|
private CryptoHandler crypto;
|
||||||
private BrowserKey mKey;
|
private BrowserKey mKey;
|
||||||
private AudioHandler audio;
|
private AudioHandler audio;
|
||||||
|
|
||||||
private Uri imageUri;
|
private Uri imageUri;
|
||||||
|
|
||||||
/** Called when the activity is first created. */
|
/** Called when the activity is first created. */
|
||||||
|
Loading…
Reference in New Issue
Block a user