Use android-maven-plugin 3.0.0 on stable branch.
Merge branch 'master' into stable
Merge branch 'master' into stable...

Use android-maven-plugin 3.0.2 on stable branch.

Conflicts:
	apidemos-android-10/pom.xml
	helloflashlight/pom.xml
	libraryprojects/pom.xml
	morseflash/pom.xml
	native/pom.xml
	pom.xml
	scala/pom.xml
	support4demos/pom.xml
Merge branch 'master' into stable

Use android-maven-plugin 3.1.0 on stable branch.

Conflicts:
	apidemos-android-10/pom.xml
	helloflashlight/pom.xml
	libraryprojects/pom.xml
	morseflash/pom.xml
	native/pom.xml
	pom.xml
	scala/pom.xml
	support4demos/pom.xml
Use android-maven-plugin 3.1.1 on stable branch.
Upgrade Robotium to 3.2.1.
Merge branch 'master' into stable

Conflicts:
	apidemos-android-10/pom.xml
	helloflashlight/pom.xml
	libraryprojects/pom.xml
	morseflash/pom.xml
	native/pom.xml
	pom.xml
	scala/pom.xml
	support4demos/pom.xml
Set a-m-p to version 3.2.0 on stable branch.
Ignore generated file.
Merge branch 'master' into stable
Upgrade a-m-p to 3.3.0 in stable branch.
Upgrade a-m-p to 3.3.1-SNAPSHOT on master branch.
Sample projects demonstrating issues with apklib with native dependencies in maven-android-plugin 3.3.0.
updating to 3.3.2-SNAPSHOT after trouble with 3.3.1 release process site generation
Add APKLIB samples to parent POM and README
Update to use the latest plugin snapshot (3.3.3)
Merge branch 'master' into apklib-native
updating to 3.3.2-SNAPSHOT after trouble with 3.3.1 release process site generation
updating to new snapshot
one more version update
Fix native compile against dependent library.
Fix pom to pickup header files to correct location in the HAR.