Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev

author Tim Murray <timmurray@google.com>

Thu, 12 Jan 2017 00:24:27 +0000 (00:24 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 12 Jan 2017 00:24:32 +0000 (00:24 +0000)
author Tim Murray <timmurray@google.com>
Thu, 12 Jan 2017 00:24:27 +0000 (00:24 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 12 Jan 2017 00:24:32 +0000 (00:24 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Tim Murray <timmurray@google.com>
	Thu, 12 Jan 2017 00:24:27 +0000 (00:24 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 12 Jan 2017 00:24:32 +0000 (00:24 +0000)