Merge "Prevent crash from null ApplicationInfo after package is removed." into nyc-dev

author Chong Zhang <chz@google.com>

Mon, 13 Jun 2016 22:16:35 +0000 (22:16 +0000)

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

Mon, 13 Jun 2016 22:16:36 +0000 (22:16 +0000)
author Chong Zhang <chz@google.com>
Mon, 13 Jun 2016 22:16:35 +0000 (22:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 13 Jun 2016 22:16:36 +0000 (22:16 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Chong Zhang <chz@google.com>
	Mon, 13 Jun 2016 22:16:35 +0000 (22:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 13 Jun 2016 22:16:36 +0000 (22:16 +0000)