Merge "Handle backup transport registration dynamically" into klp-dev

author Christopher Tate <ctate@google.com>

Fri, 15 Nov 2013 02:34:37 +0000 (02:34 +0000)

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

Fri, 15 Nov 2013 02:34:38 +0000 (02:34 +0000)
author Christopher Tate <ctate@google.com>
Fri, 15 Nov 2013 02:34:37 +0000 (02:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 15 Nov 2013 02:34:38 +0000 (02:34 +0000)
diff --cc services/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Christopher Tate <ctate@google.com>
	Fri, 15 Nov 2013 02:34:37 +0000 (02:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 15 Nov 2013 02:34:38 +0000 (02:34 +0000)