diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-13 17:02:03 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-05-13 17:02:03 -0700 |
| commit | fa019b44e44bd2dc41dcc61c72294c0510239a7f (patch) | |
| tree | c2175942e3a631ad112fe6ab17da560c45fc1ae2 /src | |
| parent | ac66142e13f9902a43aadc630744b8befc9747b1 (diff) | |
| parent | bbc6a46ddb6c47cade3cdd8a9182d974db9540f7 (diff) | |
resolved conflicts for merge of bbc6a46d to master
Change-Id: Ic1b8e4ee7f2541c3c2f2ee2c862707aa1bfe364a
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/list/ShortcutCardsAdapter.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/dialer/list/ShortcutCardsAdapter.java b/src/com/android/dialer/list/ShortcutCardsAdapter.java index 8a1f64c1d..59a5ca2bf 100644 --- a/src/com/android/dialer/list/ShortcutCardsAdapter.java +++ b/src/com/android/dialer/list/ShortcutCardsAdapter.java @@ -51,6 +51,7 @@ public class ShortcutCardsAdapter extends BaseAdapter { private static final String TAG = ShortcutCardsAdapter.class.getSimpleName(); private final CallLogAdapter mCallLogAdapter; + private final ListsFragment mFragment; private final int mCallLogPadding; |