am 7489a470: am d529d0df: Merge "bug:3396894  (HC branch) remove STOPSHIP code" into honeycomb

* commit '7489a4709daf39aff61a17818de282d9ca4dc7c8':
  bug:3396894  (HC branch) remove STOPSHIP code
tree: 33fe9c9c584ec0aec3aa4d1afa05b0bbbbdbec3f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE