tree 1a335d4cdbdffc9db1619112a02dbcfd77812099
parent bcd579d785ee5059c7e9681560449854d3d6f2ab
parent 33c44f267aa8482863a222b2e8b7fc98edd43416
author Nick Pelly <npelly@google.com> 1287762591 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1287762591 -0700

Merge "Attempt to fix simulator build." into gingerbread