tree 524049eb20aff49a6b5e8a7321bd9506b1df6acf
parent 7bfac3d8c7d4d5cfaaac6ac6ef5bc3027ec2207c
parent 1b2bd1d7863a84f938ecd9a18d0e976025ba46ac
author Android (Google) Code Review <android-gerrit@google.com> 1241127443 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1241127443 -0700

Merge change 822 into donut

* changes:
  Move some simulator fixes from master to donut. In git master they were part of change 700ccfcc01d3081ff74ef5006e8f0dec5ac52a96, which was an auto import from //branches/master/...@140412 The original change was 134529 in perforce.