tree f630dcbf9ead63e2b836e9cb3ffee2a0a4837390
parent 51a827c86eca8892cb6038d12afd73644ce3713a
parent eccc8cfb2fc83e7f924016ef31e3a4a12e347e99
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.