Merge change I60413727 into eclair

* changes:
  Fix issue #2226370: Resource versions match with equality
tree: 6d8c59f21bfe48f0ff5ad6bfb31ae4cba3ec9d57
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE