Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into...

author Dianne Hackborn <hackbod@google.com>

Tue, 19 Aug 2014 01:09:33 +0000 (01:09 +0000)

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

Sat, 16 Aug 2014 04:32:18 +0000 (04:32 +0000)
author Dianne Hackborn <hackbod@google.com>
Tue, 19 Aug 2014 01:09:33 +0000 (01:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 16 Aug 2014 04:32:18 +0000 (04:32 +0000)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Tue, 19 Aug 2014 01:09:33 +0000 (01:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 16 Aug 2014 04:32:18 +0000 (04:32 +0000)