Merge "Always perform has code check" into nyc-dev

author Todd Kennedy <toddke@google.com>

Tue, 19 Apr 2016 19:46:58 +0000 (19:46 +0000)

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

Tue, 19 Apr 2016 19:47:00 +0000 (19:47 +0000)
author Todd Kennedy <toddke@google.com>
Tue, 19 Apr 2016 19:46:58 +0000 (19:46 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 19 Apr 2016 19:47:00 +0000 (19:47 +0000)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Todd Kennedy <toddke@google.com>
	Tue, 19 Apr 2016 19:46:58 +0000 (19:46 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 19 Apr 2016 19:47:00 +0000 (19:47 +0000)