tree 87f8fd55264c8332fe00dcc7a3c2a51d6b47e0c1
parent ece3e3b231fe00b6bc0730ae4390b601f3d29ea8
parent d95aabc9eb117803ee784777fc4ffd22c55ddf43
author Marco Nelissen <marcone@google.com> 1243020607 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243020607 -0700

am 7198030f: This should fix the simulator build.

Merge commit '7198030fce4b54820a65a10d54fae18a1ab5df84'

* commit '7198030fce4b54820a65a10d54fae18a1ab5df84':
  This should fix the simulator build.