Merge "Check ManagedResource is NonNull before Checking Owner"

author nharold <nharold@google.com>

Mon, 17 Jul 2017 16:57:01 +0000 (16:57 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 17 Jul 2017 16:57:01 +0000 (16:57 +0000)
author nharold <nharold@google.com>
Mon, 17 Jul 2017 16:57:01 +0000 (16:57 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 17 Jul 2017 16:57:01 +0000 (16:57 +0000)
diff --cc services/core/java/com/android/server/IpSecService.java
Simple merge
author	nharold <nharold@google.com>
	Mon, 17 Jul 2017 16:57:01 +0000 (16:57 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 17 Jul 2017 16:57:01 +0000 (16:57 +0000)