Skip to content

Revert "Auto merge of #16566"#17107

Merged
bors-servo merged 1 commit intomasterfrom
android
May 31, 2017
Merged

Revert "Auto merge of #16566"#17107
bors-servo merged 1 commit intomasterfrom
android

Conversation

@nox
Copy link
Copy Markdown
Contributor

@nox nox commented May 31, 2017 •
edited by larsbergstrom
Loading

This change is Reviewable

@nox
Revert "Auto merge of #16566 - aneeshusa:remove-android-sdk-override,…
8790166 
… r=larsbergstrom"

This reverts commit 779edd7, reversing
changes made to 31c7198.
@highfive
Copy link
Copy Markdown

highfive commented May 31, 2017

Heads up! This PR modifies the following files:

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label May 31, 2017
@nox
Copy link
Copy Markdown
Contributor Author

nox commented May 31, 2017

@bors-servo r=larsbergstrom p=1987

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented May 31, 2017

📌 Commit 8790166 has been approved by larsbergstrom

@highfive highfive assigned larsbergstrom and unassigned emilio May 31, 2017
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels May 31, 2017
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented May 31, 2017

⌛ Testing commit 8790166 with merge c018340...

bors-servo pushed a commit that referenced this pull request May 31, 2017
Auto merge of #17107 - servo:android, r=larsbergstrom
c018340 
Revert "Auto merge of #16566"
@nox nox mentioned this pull request May 31, 2017
Merged
@bors-servo bors-servo mentioned this pull request May 31, 2017
Merged
2 tasks
@jdm jdm mentioned this pull request May 31, 2017
Open
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented May 31, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: larsbergstrom
Pushing c018340 to master...

@bors-servo bors-servo merged commit 8790166 into master May 31, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label May 31, 2017
@SimonSapin SimonSapin deleted the android branch June 2, 2017 10:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@larsbergstrom larsbergstrom

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@nox @highfive @bors-servo @larsbergstrom @emilio