am 7b449db2: am b14698ee: Merge "Finished the location settings"

* commit '7b449db21ecae05f95355544936bd840a89601c7':
This commit is contained in:
Lifu Tang
2013-12-05 19:21:28 +00:00
committed by Android Git Automerger

Diff Content Not Available