Merge "Fix issue #28931042: wtf in system server" into nyc-dev

author Dianne Hackborn <hackbod@google.com>

Wed, 25 May 2016 00:00:06 +0000 (00:00 +0000)

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

Wed, 25 May 2016 00:00:07 +0000 (00:00 +0000)
author Dianne Hackborn <hackbod@google.com>
Wed, 25 May 2016 00:00:06 +0000 (00:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 25 May 2016 00:00:07 +0000 (00:00 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Wed, 25 May 2016 00:00:06 +0000 (00:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 25 May 2016 00:00:07 +0000 (00:00 +0000)