resolve merge conflicts of a800795a to master

package com.android.systemui.qs.tiles;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.os.UserManager;

/** Quick settings tile: Hotspot **/

public class HotspotTile extends QSTile<QSTile.AirplaneBooleanState> {

    static final Intent TETHER_SETTINGS = new Intent().setComponent(new ComponentName(

             "com.android.settings", "com.android.settings.TetherSettings"));

    private final AnimationIcon mEnable =

            new AnimationIcon(R.drawable.ic_hotspot_enable_animation,

                    R.drawable.ic_hotspot_disable);

    @Override

    public Intent getLongClickIntent() {

        return new Intent(Settings.ACTION_WIRELESS_SETTINGS);

        return new Intent(TETHER_SETTINGS);

    }

    @Override