am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.

* commit '34f5991ebe8b203f1720caf95889c15dd131d86e':
  Merge 6103e22c from honeycomb-mr1. do not merge.
tree: a261cac5a69ebbc5cf717395918b6e0cdf6cd0be
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE