am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.

Merge commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513' into gingerbread-plus-aosp

* commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513':
  Do not merge.
tree: 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE