appcelerator/titanium_mobile — pull request #5185 by ayeung (2014-01-03 23:07:28+00:00)
Title: TIMOB-16088: Only skip android manifest merge if a custom manifest exists

https://jira.appcelerator.org/browse/TIMOB-16088

Test case in Jira. Please also test the case where you don't have a custom android manifest.