Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev

Browse Source 
am: 32ca41d028

Change-Id: I73b1ed0210f01ad6bf81089fef408765f34426a1
This commit is contained in:
Yi Jin
2018-03-21 21:49:17 +00:00
committed by android-build-merger
parent d70f55fd62 32ca41d028
commit 4876868997
64 changed files with 291 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityThread.java
View File

@@ -147,7 +147,7 @@ import com.android.internal.util.ArrayUtils;
import com.android.internal.util.FastPrintWriter;
import com.android.org.conscrypt.OpenSSLSocketImpl;
import com.android.org.conscrypt.TrustedCertificateStore;
import com.android.server.am.proto.MemInfoDumpProto;
import com.android.server.am.MemInfoDumpProto;
import dalvik.system.BaseDexClassLoader;
import dalvik.system.CloseGuard;