Merge commit '22375e4a' into froyo-plus-aosp * commit '22375e4a': Make RestoreSession.getAvailableRestoreSets() asynchronous