am b481a600: am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2

* commit 'b481a6007f3c0e9f50ddb2e126fc5d8188961b25':
  cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
tree: 01e09e2a5586c79999831795bce23b509374fcce
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE