Merge branch 'CB-5753'
authorIan Clelland <iclelland@chromium.org>
Tue, 2 Dec 2014 21:11:31 +0000 (16:11 -0500)
committerIan Clelland <iclelland@chromium.org>
Tue, 2 Dec 2014 21:12:39 +0000 (16:12 -0500)
commit5c63a069b73844408ec2d7c36d086743200f0c46
tree0b17d794ec235762463ed2073e24f76ff7e8ac3d
parent41233f66f651868694c468eb6d139098102697d6
parent55194aab45a17335e7bc581c3ce031c5311991f9
Merge branch 'CB-5753'

Fixes an error where geolocation would stop if the location service
couldn't immediately retrieve a location.