Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TIMOB-16088-3_2_X: Only skip android manifest merge if a custom manifest exists #5186

Merged
merged 1 commit into from Jan 6, 2014

Conversation

ayeung
Copy link
Contributor

@ayeung ayeung commented Jan 3, 2014

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.

@srahim
Copy link
Contributor

srahim commented Jan 6, 2014

CR and FR passed

APPROVED

srahim added a commit that referenced this pull request Jan 6, 2014
TIMOB-16088-3_2_X: Only skip android manifest merge if a custom manifest exists
@srahim srahim merged commit 8fc170a into tidev:3_2_X Jan 6, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants