am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1

* commit 'cc886b93681b75a9b89331930435e0f527b2c3d7':
  Fixing naming for disabled paste assets Updated paste assets
tree: cafc00670911caca00d26f0f2048a2ee8b5afa09
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE