am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb

* commit '2e96f15d8c6608c6bcb49c73fe13078a57245b28':
  Fix issues 3425035 and 3423785.
tree: 0b8accc2d5b58e5121e60ec38a0a2b829f266455
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE