final StopsListAdapter stopsListAdapter = new StopsListAdapter(getApplicationContext(), R.layout.stoprow, this);
		int i = 0;
		for (Stop stop : stops) {
<<<<<<< HEAD
			stopsListAdapter.add(stop);
=======
			stopsListAdapter.add(StopDescriptionService.makeStopDescription(stop, location));
			
			if (location != null) {
				float distanceTo = DistanceMeasuringService.distanceTo(location, stop);
				if (closestDistance == null || closestDistance > distanceTo) {
					selectedPosition = i;
					closestDistance = distanceTo;
				}
			}
			
>>>>>>> 457af69495ac19d332a6bc80f4a8aee8e520cc86
			if (selectedStop != null && selectedStop.equals(stop)) {
				selectedPosition = i;
			}			

		final StopsListAdapter stopsListAdapter = new StopsListAdapter(getApplicationContext(), R.layout.stoprow, this);
		int i = 0;
		for (Stop stop : stops) {
			stopsListAdapter.add(stop);

			if (location != null) {
				float distanceTo = DistanceMeasuringService.distanceTo(location, stop);
				if (closestDistance == null || closestDistance > distanceTo) {
					selectedPosition = i;
					closestDistance = distanceTo;
				}
			}

			if (selectedStop != null && selectedStop.equals(stop)) {
				selectedPosition = i;
			}