am 6d02f3f3: Merge change I71f48a21 into eclair

Merge commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-mr2

* commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
  Reduce the amount of EriManager Logging.
tree: 11bb7fd650a2bb14eeb23a2c339526a5480235fc
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE