am 2359d49b: Merge "DO NOT MERGE - redo  Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread

Merge commit '2359d49b80df13c1724c7c6da5648f17a33d881a' into gingerbread-plus-aosp

* commit '2359d49b80df13c1724c7c6da5648f17a33d881a':
  DO NOT MERGE - redo  Ib5e519fb40d3191ecac06c03a844872df19f3963
tree: fd1cec90131d511cef7044bbb20426a826c1a933
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE