OSDN Git Service

Merge "Update timeout log from Slog.wtf() to Slog.w()." into pi-dev
authorSudheer Shanka <sudheersai@google.com>
Thu, 12 Apr 2018 01:05:38 +0000 (18:05 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Apr 2018 01:05:38 +0000 (18:05 -0700)
commite00fdf63a83b94c113c411544fea27c133f30f59
tree9ec2011da60a259d3e0292a5b62e7a831b150246
parentec69f61cc4488d6ff7134c2d14551f3ecc08ee1f
parent092031d623bb0be559f9c92fa7c03a0110cc0a5c
Merge "Update timeout log from Slog.wtf() to Slog.w()." into pi-dev
am: 092031d623

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