OSDN Git Service

Merge "Added 'dumpsys activity lastanr'" into oc-dev
authorWale Ogunwale <ogunwale@google.com>
Sat, 10 Jun 2017 16:05:53 +0000 (16:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 10 Jun 2017 16:05:53 +0000 (16:05 +0000)
commita96a9f7326e066c1bd6a613f2743aa9e96133625
tree53713fc373a00af855c809e80c1f6f4b19387090
parent70a2b34938393eb55dca43de469a434174112c29
parentb32fecd6e0dad258542e702144a04b3cadea6bd3
Merge "Added 'dumpsys activity lastanr'" into oc-dev
am: b32fecd6e0

Change-Id: Iede7911ea687b7890833ee967da010db6041fb49
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/wm/WindowManagerService.java