am 141a2adb: am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb

* commit '141a2adb25130bcbe8620ae239e94d33c7c92eef':
  Revert "Fixes Issue ID: 3396697"
tree: 33fe9c9c584ec0aec3aa4d1afa05b0bbbbdbec3f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE