siacs/Conversations — pull request #555 by SamWhited (2014-10-16 14:58:14+00:00)
Title: Fix problem when merging manifests during a Gradle build

When building using Gradle (Gradle aware make, Android Studio import, etc.) there is a conflict between MTM `android:label` and Conversations if manifest merging is turned on. This patch fixes that, but does not affect the standard ant build. Mostly it's useful for people who want to use parts of Conversations in another Gradle aware project, or import Conversations into Android Studio.