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

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base