Moved the @parameter line to the end of the javadoc for mergeManifests in order to have all its documentation make it to the help mojo.
Merge pull request #142 from tlbollwitt/forked-mods

Fixed javadoc for mergeManifests attribute
Merge branch 'master' of github.com:jayway/maven-android-plugin
[maven-release-plugin] prepare release 3.4.0
[maven-release-plugin] prepare for next development iteration
Move the logic to determine the resourceDirectories to the AbstractAndroidMojo class.
Have the ApklibMojo also use these directories when packaging the apklib
fix line endings
Merge pull request #143 from mithepner/master

apklib now uses the resourceOverlayDirectories and resourceOverlayDirectory options
Use StdSdkLog instead of NullSdkLog so that merging errors make it to the console output
undo code reformatting from pull request from Tom
fixed bug: tests are not run when more packages are specified
Updated Manifest Merge functionality.
Added support for SDK Tools R21.
showing current test count to make progress tracking easier
It looks like this:
[INFO]     Start [19/128]: your.package.YourTest
[INFO]     End [19/128]: your.package.YourTest
Merge pull request #147 from olekp/testProgress

showing current test count to make progress tracking easier
Merge pull request #146 from tlbollwitt/forked-mods

Updated Manifest Merge functionality to support SDK Tools R21.
Merge pull request #145 from olekp/testPackagesFix

fixed bug: tests are not run when more packages are specified
fixed manifest merging strategy selection to work for r20 of the sdk and use the strategy for older versions as well instead of bailing out completely, not tested older versions but will rely on community to let us know
fixed checkstyle issues causing build breakage
Return value of installPackage() was being ignored.

From docs  the return value of installPackages() returns and error code, or null if success. This was being ignored.

Errors like INSTALL_FAILED_SHARED_USER_INCOMPATIBLE were being silently ignored.

Before:

[INFO] Found 1 devices connected with the Android Debug Bridge
[INFO] android.device parameter not set, using all attached devices
[INFO] Successfully installed backup.apk to LG-F180K-ce93d35f_LGE_LG-F180K
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS

After:

[ERROR] Failed to execute goal com.jayway.maven.plugins.android.generation2:android-maven-plugin:3.4.1-SNAPSHOT:deploy (default-cli) on project backup: Install of backup.apk failed - [INSTALL_FAILED_SHARED_USER_INCOMPATIBLE] -> [Help 1]
Merge pull request #148 from nicstrong/deploy-error-handling

Return value of installPackage() was being ignored.