am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread

* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
  docs: remove "new" tags from sample apps
tree: 1a3c683f8da28300d3c93bea95b96290d9e30dbe
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE