diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-21 21:24:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-21 21:24:19 +0000 |
| commit | 32ca41d02880686148cfa730897c575104cf045c (patch) | |
| tree | 921497c1a7ec0c76e91cbe188494b088aa8e470f /core/java/android | |
| parent | b1223f4525bb4a08c0df5a7c3fed11c4077dc24e (diff) | |
| parent | 6c6e9cab42bccb44ebb4b30e7eab7394c0dbb759 (diff) | |
Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 1d069bc19872..baf2d6027ca9 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -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; |