am 353bd75b: am 18414c4d: Merge "Provide SharedPreferences coherence...
am 353bd75b: am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev
* commit '353bd75b':
Provide SharedPreferences coherence guarantees for BackupAgent