am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1

* commit '55a9be3d284d17045d9d3546c57d9dc3c4c8a521':
  Fix for bug 3434228
tree: 893cffe99a7daf89da23f5ef9ef070fb5a097894
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE