85d765f4
Merge commit '85d765f41c20e6efb3b120055eb4f1efae166e8b' into eclair-plus-aosp * commit '85d765f41c20e6efb3b120055eb4f1efae166e8b': Quick backup/restore of accounts DO NOT MERGE