]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #11629 : brson/rust/whattayaknowitsmoreandroidfixes, r=cmr
authorbors <bors@rust-lang.org>
Sat, 18 Jan 2014 15:36:43 +0000 (07:36 -0800)
committerbors <bors@rust-lang.org>
Sat, 18 Jan 2014 15:36:43 +0000 (07:36 -0800)

Trivial merge