diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:51:19 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:51:19 -0700 |
| commit | b67e7dcae432b0e5070ca812477a2f0663f03b78 (patch) | |
| tree | 9f93a36a88bd4eb4321cc5704eb001b042cde21b /src/com/android/calculator2/AlertDialogFragment.java | |
| parent | 232eb2eca41c9da72f2073a90405e09db2e60e9f (diff) | |
| parent | eb5bcc810d45df76ab038c764f29ce487d70fb4b (diff) | |
| download | ExactCalculator-b67e7dcae432b0e5070ca812477a2f0663f03b78.tar.gz | |
Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
Bug: 112104996
Change-Id: I7f86f50ff9a100921c2a1afe34b12b8cc1304e9f
Diffstat (limited to 'src/com/android/calculator2/AlertDialogFragment.java')
| -rw-r--r-- | src/com/android/calculator2/AlertDialogFragment.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/calculator2/AlertDialogFragment.java b/src/com/android/calculator2/AlertDialogFragment.java index fdb7427..3939a73 100644 --- a/src/com/android/calculator2/AlertDialogFragment.java +++ b/src/com/android/calculator2/AlertDialogFragment.java @@ -23,8 +23,8 @@ import android.app.DialogFragment; import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.view.LayoutInflater; import android.widget.TextView; |