diff options
| author |   Xin Li <delphij@google.com> | 2019-09-05 16:53:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-05 16:53:24 +0000 |
| commit | ccb19fdda7a4ef49eeb6195b6a43ffedb269c670 (patch) | |
| tree | 06816df073e9c2aedd67f8806efed9e31d25517f /java/src/com/android/inputmethod/latin/settings/SettingsActivity.java | |
| parent | c8db60faa55ef3ee9780b13ce361f5c08756a5f1 (diff) | |
| parent | 66fb808791b86e7e0903a834fdfa187132ea0bdf (diff) | |
| download | latinime-ccb19fdda7a4ef49eeb6195b6a43ffedb269c670.tar.gz latinime-ccb19fdda7a4ef49eeb6195b6a43ffedb269c670.tar.xz latinime-ccb19fdda7a4ef49eeb6195b6a43ffedb269c670.zip | |
Merge "DO NOT MERGE - Merge Android 10 into master"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/SettingsActivity.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java b/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java index a7d157a6b..ac1657762 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java @@ -25,7 +25,7 @@ import android.app.ActionBar; import android.content.Intent; import android.os.Bundle; import android.preference.PreferenceActivity; -import android.support.v4.app.ActivityCompat; +import androidx.core.app.ActivityCompat; import android.view.MenuItem; public final class SettingsActivity extends PreferenceActivity |