tree c4fed83b6fd5ac3602c7e4477ac762fb3f1a5f4a
parent 8ad028117d4b99883bbc52b29f097b2fb1d9b0c2
parent 3cc68d28c7636fc8d0524155fc062991e7f85f63
author Android (Google) Code Review <android-gerrit@google.com> 1242199249 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1242199249 -0700

Merge change 1528 into donut

* changes:
  should help fix the Simulator build.