Merge "Follow up for I420bee8a11d430b1e52ded050536e56a85a48800" into nyc-mr1-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Thu, 28 Jul 2016 19:19:59 +0000 (19:19 +0000)

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

Thu, 28 Jul 2016 19:20:00 +0000 (19:20 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 28 Jul 2016 19:19:59 +0000 (19:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 28 Jul 2016 19:20:00 +0000 (19:20 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 28 Jul 2016 19:19:59 +0000 (19:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 28 Jul 2016 19:20:00 +0000 (19:20 +0000)