Merge "Fix issue #29438842: Enter the "am broadcast -a..." into nyc-dev

author Dianne Hackborn <hackbod@google.com>

Mon, 20 Jun 2016 22:09:27 +0000 (22:09 +0000)

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

Mon, 20 Jun 2016 22:09:30 +0000 (22:09 +0000)
author Dianne Hackborn <hackbod@google.com>
Mon, 20 Jun 2016 22:09:27 +0000 (22:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 20 Jun 2016 22:09:30 +0000 (22:09 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Mon, 20 Jun 2016 22:09:27 +0000 (22:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 20 Jun 2016 22:09:30 +0000 (22:09 +0000)