Commits
Jeff Sharkey authored and Android Git Automerger committed 148b2dcba7bM
am e2243c89: am 9254d310: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev * commit 'e2243c89cdaaaade144448a03da336b120aeb0e4':
Showing diff to0612277c15f