OSDN Git Service

Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev
authorMartijn Coenen <maco@google.com>
Sat, 26 May 2018 09:19:18 +0000 (02:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 26 May 2018 09:19:18 +0000 (02:19 -0700)
commita634f425d92e7e4da2dd2dbdf6d83ccd6e480d75
tree9c4ea8606bc7db8954cc8529702915fffa02fcb3
parent9f6c8feb6fb72b8ba40783a201e841797d2e9cf9
parent879d09f94607e2f8776bc91a918bef6c7cab3bb3
Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev
am: 879d09f946

Change-Id: I02d14f682c6476b703d160dab911a3afc14af627
services/core/java/com/android/server/am/ActivityManagerService.java