am cd412600: (-s ours) am 7b449db2: am b14698ee: Merge "Finished the location settings"

* commit 'cd4126005dd7ef8808171c07df07ebb149170d1e':
This commit is contained in:
Lifu Tang
2013-12-05 22:45:12 +00:00
committed by Android Git Automerger

Diff Content Not Available