am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2

* commit '2e0f71181792780b55826bcc562ae79951e76f1b':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
tree: f949892f9d4299de57cbfad53d96970f7cb51df1
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE