OSDN Git Service

Merge "More encryption-aware triaging." into nyc-dev
authorJeff Sharkey <jsharkey@google.com>
Tue, 9 Feb 2016 23:00:54 +0000 (23:00 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 9 Feb 2016 23:00:55 +0000 (23:00 +0000)
commit950b30426e24bb38b7b2ffb461dc0b46e79b35d1
tree51ee7fb1ac41a6a8c2b580b887b518dde06f5f84
parentea46bb2cbfa301ea3d5c38968636c1c1435ad47d
parentc7bacab20fa8a0e603726f4f8ebafd3a96babeb1
Merge "More encryption-aware triaging." into nyc-dev
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/notification/NotificationManagerService.java