am 1c2911a6: Merge "Fix bug 3061769" into gingerbread

Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp

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