diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-08-04 14:54:19 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-08-07 15:21:54 +0000 |
| commit | 10ae593a59aa50963e1d3159747da2d65ca79bed (patch) | |
| tree | 7f98300ff2318f2eefb50d84ca2701a416590fb4 /java/com/android/dialer/speeddial/SpeedDialFragment.java | |
| parent | e1a73952372a7ceee493863520e5046e6d979dc0 (diff) | |
| download | android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.gz android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.bz2 android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.zip | |
This change brings Dialer oc-mr1-dev up to date with v11.1 RC06.
This is to resolve a merge conflict in:
I48296c56fb1d275a06b7c314f5380266c1195ef2
Test: make
master is already up to date and
Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9
Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
Diffstat (limited to 'java/com/android/dialer/speeddial/SpeedDialFragment.java')
| -rw-r--r-- | java/com/android/dialer/speeddial/SpeedDialFragment.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java index c087439eb..68ee3888b 100644 --- a/java/com/android/dialer/speeddial/SpeedDialFragment.java +++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java @@ -23,7 +23,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -/** Favorites fragment. Contents TBD. TODO(calderwoodra) */ +/** Favorites fragment. Contents TBD. TODO */ public class SpeedDialFragment extends Fragment { public static SpeedDialFragment newInstance() { @@ -38,7 +38,7 @@ public class SpeedDialFragment extends Fragment { } public boolean hasFrequents() { - // TODO(calderwoodra) + // TODO return false; } } |