tree 455b6ac4975e762929d42d17fdc308cbbee781cd
parent 087c06039faeac54aa3063b643c5a6aafe51aa30
parent 7ab900edd69324e5eeb2c6b01ef3ef5e836689a3
author Dave Sparks <davidsparks@android.com> 1257545480 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257545480 -0800

am 7ab900ed: Merge change Ic8093c11 into eclair

Merge commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3' into eclair-mr2

* commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3':
  Hold a lock while we access the preview heap.