tree 6c1b56465f9cc35dc1042da8e29e475e82664fe4
parent e1413a9e9cdb2dd2792d318542db483b188276c8
parent c8a4b11e1f752b901610472039f981f97a65aae6
author Stephen Hines <srhines@google.com> 1299709964 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299709964 -0800

am c8a4b11e: Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1

* commit 'c8a4b11e1f752b901610472039f981f97a65aae6':
  Fix a race condition during Context init/teardown.