am 5941176: Merge change 822 into donut
Merge commit '5941176ccd7f05ed1786f0b45ecc0905b0effc49' * commit '5941176ccd7f05ed1786f0b45ecc0905b0effc49': Move some simulator fixes from master to donut.
This commit is contained in:
committed by
The Android Open Source Project
commit
5f6be13bf7