Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10e4c7f2 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Fix build."

parents fc6cd75f c045208f
Loading
Loading
Loading
Loading
+17 −3
Original line number Original line Diff line number Diff line
package com.android.internal.policy.impl;
/*
 * Copyright (C) 2015 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License
 */

package com.android.server.policy;


import android.app.AlarmManager;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.app.PendingIntent;
@@ -9,9 +25,7 @@ import android.content.IntentFilter;
import android.content.res.Resources;
import android.content.res.Resources;
import android.hardware.display.DisplayManager;
import android.hardware.display.DisplayManager;
import android.hardware.display.DisplayManagerInternal;
import android.hardware.display.DisplayManagerInternal;
import android.os.Handler;
import android.os.SystemClock;
import android.os.SystemClock;
import android.util.Log;
import android.view.Display;
import android.view.Display;


import com.android.server.LocalServices;
import com.android.server.LocalServices;