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

* commit 'c8a4b11e1f752b901610472039f981f97a65aae6':
  Fix a race condition during Context init/teardown.
tree: ffa8444c8ca09fd26bed60ad7273697d26037c23
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE