Merge commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b' into eclair-mr2-plus-aosp * commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b': Add saving/restoring state in CredentialInstaller and ...
Merge commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b' into eclair-mr2-plus-aosp * commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b': Add saving/restoring state in CredentialInstaller and ...