OSDN Git Service

Merge "Rename dumpsys protos to make platform proto names consistent."
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 1 Mar 2018 00:54:51 +0000 (00:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 1 Mar 2018 00:54:51 +0000 (00:54 +0000)
commitef71a4cc6ec290c09d8b33694e6ef78a8bfe56a7
treeaddf5dfadafd053a259dd5d2000f7fc2b56bbca1
parentefbdc6b04a53b3e6168e561a867b28fb5511be0c
parent2b30f322128722d7e5bec8a6a737f3762a6ae98a
Merge "Rename dumpsys protos to make platform proto names consistent."
core/java/android/app/ActivityThread.java
services/core/java/com/android/server/am/ActivityManagerService.java