am cd7dfcec: (-s ours) am 40b207c1: Merge "Using proper key for removing object from the map."

* commit 'cd7dfcec4b9a059cd67783c8abed72f74c03c4b0':
  Using proper key for removing object from the map.
tree: ad3cf2304e44d77a583ac28ff560bf9310fffd1a
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE