resolved conflicts for merge of 07990cf2 to master

import android.os.Handler;

import android.os.Message;

import android.os.SystemClock;

import android.text.TextUtils;

import android.util.Slog;

import android.util.Log;

import android.view.Display;

        }

        // Restart the ticker if it's still running

        if (notification.notification.tickerText != null

                && !TextUtils.equals(notification.notification.tickerText,

                    oldEntry.notification.notification.tickerText)) {

            tick(notification);

        }

        // Recalculate the position of the sliding windows and the titles.

        setAreThereNotifications();