am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb

* commit '699a0969434b6ee434dd9f5f212fe1bb914fdf0d':
  DO NOT MERGE Removing an activity that shouldn't go into samples
tree: ea8394774dd2af9d10699c0198d5639d47f212a6
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE