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

Commit 26008b92 authored by Robert Sesek's avatar Robert Sesek Committed by android-build-merger
Browse files

resolve merge conflicts of 0b58f198 to nyc-mr1-dev-plus-aosp 

am: aa3c463a

Change-Id: Ib213dc42ac82d6bf738e727d56794a3cd6b1a35d
parents fcfa01c0 aa3c463a

core/java/android/os/Process.java

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
package android.os;



import android.annotation.TestApi;

import android.net.LocalSocket;

import android.net.LocalSocketAddress;

import android.system.Os;

import android.system.OsConstants;

import android.util.Log;