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

Android refixup #6054

Merged
merged 2 commits into from May 14, 2015
Merged

Android refixup #6054

merged 2 commits into from May 14, 2015

Conversation

@larsbergstrom
Copy link
Contributor

larsbergstrom commented May 14, 2015

It appears that #6012 reverted our attempts to update the android submodule - probably a bad rebase. This re-fixes it and also updates the debugging code to modern Rust.

r? @mbrubeck

Review on Reviewable

@mbrubeck
Copy link
Contributor

mbrubeck commented May 14, 2015

@bors-servo
Copy link
Contributor

bors-servo commented May 14, 2015

📌 Commit da88ac3 has been approved by mbrubeck

@bors-servo
Copy link
Contributor

bors-servo commented May 14, 2015

Testing commit da88ac3 with merge 5bdf20e...

bors-servo pushed a commit that referenced this pull request May 14, 2015
It appears that #6012 reverted our attempts to update the android submodule - probably a bad rebase. This re-fixes it and also updates the debugging code to modern Rust.

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6054)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 14, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2

@bors-servo bors-servo merged commit da88ac3 into servo:master May 14, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@larsbergstrom larsbergstrom deleted the larsbergstrom:android_refixup branch Sep 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.