Commits
Jeff Sharkey authored and Android Git Automerger committed f1ad6d5b79eM
am 93b17876: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev * commit '93b17876d44f27141335295ee9ffd88bb9f23817': More migration to Global settings.
Showing diff to0fab9247c9e