Files
android-calculatorpp/calculatorpp/src/main/java/org
Sergey Solovyev 1a284cbf13 Merge remote-tracking branch 'origin/dev-widget' into dev-widget
Conflicts:
	calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
	calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
2012-10-26 21:37:48 +04:00
..