lesson41 added
lesson41 added
 Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml
	lesson38(SQLiteTransactions)/AndroidManifest.xml
	lesson38(SQLiteTransactions)/ant.properties
	lesson38(SQLiteTransactions)/build.xml
	lesson38(SQLiteTransactions)/lesson38(SQLiteTransactions).iml
	lesson38(SQLiteTransactions)/proguard-project.txt
	lesson38(SQLiteTransactions)/project.properties
	lesson38(SQLiteTransactions)/res/drawable-hdpi/ic_launcher.png
	lesson38(SQLiteTransactions)/res/drawable-ldpi/ic_launcher.png
	lesson38(SQLiteTransactions)/res/drawable-mdpi/ic_launcher.png
	lesson38(SQLiteTransactions)/res/drawable-xhdpi/ic_launcher.png
	lesson38(SQLiteTransactions)/res/layout/main.xml
	lesson38(SQLiteTransactions)/res/values/strings.xml
	lesson38(SQLiteTransactions)/src/com/squark23/lesson38/MyActivity.java
	lesson39(SQLiteOnUpgradeDB)/AndroidManifest.xml
	lesson39(SQLiteOnUpgradeDB)/ant.properties
	lesson39(SQLiteOnUpgradeDB)/build.xml
	lesson39(SQLiteOnUpgradeDB)/lesson39(SQLiteOnUpgradeDB).iml
	lesson39(SQLiteOnUpgradeDB)/proguard-project.txt
	lesson39(SQLiteOnUpgradeDB)/project.properties
	lesson39(SQLiteOnUpgradeDB)/res/drawable-hdpi/ic_launcher.png
	lesson39(SQLiteOnUpgradeDB)/res/drawable-ldpi/ic_launcher.png
	lesson39(SQLiteOnUpgradeDB)/res/drawable-mdpi/ic_launcher.png
	lesson39(SQLiteOnUpgradeDB)/res/drawable-xhdpi/ic_launcher.png
	lesson39(SQLiteOnUpgradeDB)/res/layout/main.xml
	lesson39(SQLiteOnUpgradeDB)/res/values/strings.xml
	lesson39(SQLiteOnUpgradeDB)/src/com/squark23/lesson39/MyActivity.java
	lesson40(LayoutInflater)/AndroidManifest.xml
	lesson40(LayoutInflater)/ant.properties
	lesson40(LayoutInflater)/build.xml
	lesson40(LayoutInflater)/lesson40(LayoutInflater).iml
	lesson40(LayoutInflater)/proguard-project.txt
	lesson40(LayoutInflater)/project.properties
	lesson40(LayoutInflater)/res/drawable-hdpi/ic_launcher.png
	lesson40(LayoutInflater)/res/drawable-ldpi/ic_launcher.png
	lesson40(LayoutInflater)/res/drawable-mdpi/ic_launcher.png
	lesson40(LayoutInflater)/res/drawable-xhdpi/ic_launcher.png
	lesson40(LayoutInflater)/res/layout/main.xml
	lesson40(LayoutInflater)/res/layout/text.xml
	lesson40(LayoutInflater)/res/values/strings.xml
	lesson40(LayoutInflater)/src/com/squark23/lesson40/MyActivity.java