am 717ad24a: am 9d0fbd72: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev

* commit '717ad24a822c40044992743025e93664281136f4':
This commit is contained in:
Jeff Sharkey
2012-10-29 13:39:39 -07:00
committed by Android Git Automerger

Diff Content Not Available