9a7bb5dbc1
Conflicts: calculatorpp-core/src/main/java/org/solovyev/android/calculator/Locator.java calculatorpp-core/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java calculatorpp/src/main/java/org/solovyev/android/calculator/external/DefaultExternalCalculatorIntentHandler.java calculatorpp/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorHelper.java calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetHelper.java calculatorpp/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java