Commits
Christopher Tate authored and Android Git Automerger committed d87cb794b06M
am 0cd3c976: Merge "Settings (and general) restore fixes" into jb-mr1-dev * commit '0cd3c976a273a25c2d642064ade997bdf9d99855': Settings (and general) restore fixes
Showing diff tof2e292f5548