Auto merge of #6283 - mbrubeck:linkargs, r=nox

Fixes #6275 via tomaka/android-rs-glue#58. r? @larsbergstrom or @glennw

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6283)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-04 11:36:36 -05:00
commit 0bbc28236a

@ -1 +1 @@
Subproject commit dc8aef3e1b8f1acd141986cfab492e3f57d2d5f6 Subproject commit 4ed3cb30b289aa0aa84a00e0d5682bc853108e5a