Auto merge of #6024 - larsbergstrom:android_update, r=mbrubeck

fixes #6002

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6024)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-12 16:22:20 -05:00
commit 234fb68a16

@ -1 +1 @@
Subproject commit 10116eb3af332f9565e0fb803e600511bb585d6b
Subproject commit dc8aef3e1b8f1acd141986cfab492e3f57d2d5f6