Merge "[ActivityManager] Prevent provider from been created twice."

author Craig Mautner <cmautner@google.com>

Mon, 1 Dec 2014 00:16:38 +0000 (00:16 +0000)

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

Mon, 1 Dec 2014 00:16:41 +0000 (00:16 +0000)
author Craig Mautner <cmautner@google.com>
Mon, 1 Dec 2014 00:16:38 +0000 (00:16 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 1 Dec 2014 00:16:41 +0000 (00:16 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Craig Mautner <cmautner@google.com>
	Mon, 1 Dec 2014 00:16:38 +0000 (00:16 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 1 Dec 2014 00:16:41 +0000 (00:16 +0000)