Merge "Added extra check to avoid NPE if package does not exist." into nyc-dev

author Felipe Leme <felipeal@google.com>

Wed, 17 Feb 2016 00:46:14 +0000 (00:46 +0000)

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

Wed, 17 Feb 2016 00:46:17 +0000 (00:46 +0000)
author Felipe Leme <felipeal@google.com>
Wed, 17 Feb 2016 00:46:14 +0000 (00:46 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 17 Feb 2016 00:46:17 +0000 (00:46 +0000)
diff --cc services/core/java/com/android/server/net/NetworkPolicyManagerService.java
Simple merge
author	Felipe Leme <felipeal@google.com>
	Wed, 17 Feb 2016 00:46:14 +0000 (00:46 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 17 Feb 2016 00:46:17 +0000 (00:46 +0000)