fixes
Merge https://github.com/wantowan2/packages_apps_LockClock

Conflicts:
	Android.mk
	README.md
	res/layout/calendar_item.xml
	res/layout/calendar_panel.xml
	res/layout/clock_panel.xml
	res/layout/clock_panel_small.xml
	res/layout/weather_panel_small.xml
	res/values-af/donottranslate.xml
	res/values-af/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/donottranslate.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hu/strings.xml
	res/values-it/strings.xml
	res/values-ja/strings.xml
	res/values-nb/strings.xml
	res/values-nl/donottranslate.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rBR/strings.xml
	res/values-ru/strings.xml
	res/values-xhdpi/dimens.xml
	res/values-zh-rCN/strings.xml
	res/values/arrays.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	res/xml/preferences_calendar.xml
	res/xml/preferences_clock.xml
	res/xml/preferences_headers.xml
	res/xml/preferences_weather.xml
	src/com/cyanogenmod/lockclock/ClockWidgetProvider.java
	src/com/cyanogenmod/lockclock/ClockWidgetService.java
	src/com/cyanogenmod/lockclock/misc/CalendarInfo.java
	src/com/cyanogenmod/lockclock/misc/Constants.java
	src/com/cyanogenmod/lockclock/misc/Preferences.java
	src/com/cyanogenmod/lockclock/misc/WidgetUtils.java
	src/com/cyanogenmod/lockclock/preference/CalendarPreferences.java
	src/com/cyanogenmod/lockclock/preference/ClockPreferences.java
	src/com/cyanogenmod/lockclock/preference/Preferences.java
	src/com/cyanogenmod/lockclock/preference/WeatherPreferences.java
	src/com/cyanogenmod/lockclock/weather/HttpRetriever.java
	src/com/cyanogenmod/lockclock/weather/WeatherInfo.java
	src/com/cyanogenmod/lockclock/weather/WeatherUpdateService.java
	src/com/cyanogenmod/lockclock/weather/YahooPlaceFinder.java