am bbf00cfb: (-s ours) am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread

Merge commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4'

* commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4':
  DO NOT MERGE Fix bug 3026771, other design/asset fixes.
tree: 1f0d342cbed2ea50622e9a4e941d45ace6afca65
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE