Merge commit '305bcbf0c961840c4505770d084a1caacc074dbb' into gingerbread-plus-aosp * commit '305bcbf0c961840c4505770d084a1caacc074dbb': Decrease PackageManagerService wait time for vold
Merge commit '305bcbf0c961840c4505770d084a1caacc074dbb' into gingerbread-plus-aosp * commit '305bcbf0c961840c4505770d084a1caacc074dbb': Decrease PackageManagerService wait time for vold