am d29e6861: Merge "Fix bug 3058324" into gingerbread

Merge commit 'd29e6861717a4e762050eb5a30169729e205d651' into gingerbread-plus-aosp

* commit 'd29e6861717a4e762050eb5a30169729e205d651':
  Fix bug 3058324
tree: 8a2ad642b3eb79903546ed32f689a47927a9a405
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE