OSDN Git Service

Merge "Added 'dumpsys activity lastanr'" into oc-dev am: b32fecd6e0
authorWale Ogunwale <ogunwale@google.com>
Sat, 10 Jun 2017 16:13:51 +0000 (16:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 10 Jun 2017 16:13:51 +0000 (16:13 +0000)
commitce777c67e75f89a7c15734da75d6a26831f39640
treea70a02879c1687d3a747c0798ac3b6f2e1275ee2
parente637937af7f9b220167f65d23c2ffbc7661b99ee
parentba16911723bef4d406f2a51f30ffebad892db532
Merge "Added 'dumpsys activity lastanr'" into oc-dev am: b32fecd6e0
am: ba16911723

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