diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-03-06 22:13:14 +0900 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-09 10:16:20 +0100 |
| commit | a54fe6d7be57b130d0261964d8e912b34345f751 (patch) | |
| tree | ac3f8332546f9db63c64055789bb42755aa61661 /android | |
| parent | 1a8b898842f2d4a0c5576e68bfa45b9737ab5fbf (diff) | |
android: fix rebase import problem
Change-Id: Id668dc509dc3fa02e9a248716050c16a8cf91419
Diffstat (limited to 'android')
| -rw-r--r-- | android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java | 2 | ||||
| -rw-r--r-- | android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java index f50b62af077c..94197822363e 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java @@ -1,6 +1,8 @@ package org.libreoffice; +import android.content.Intent; import android.graphics.RectF; +import android.net.Uri; import android.util.Log; import org.libreoffice.kit.Document; diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java index ae14cc65c25f..3a24120ae64b 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java @@ -5,8 +5,6 @@ import android.graphics.PointF; import android.graphics.RectF; import android.util.Log; import android.view.KeyEvent; -import android.net.Uri; -import android.content.Intent; import org.libreoffice.kit.DirectBufferAllocator; import org.libreoffice.kit.Document; |