am 85bccf6e: (-s ours) am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb

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