Commits
Christopher Tate authored and Android Git Automerger committed 49bbbf2c1c9M
am d87cb794: am 0cd3c976: Merge "Settings (and general) restore fixes" into jb-mr1-dev * commit 'd87cb794b063c503f4d732141904bd1edd5c5914': Settings (and general) restore fixes
Showing diff to35512ab0069