am 0358def7: (-s ours) am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread

Merge commit '0358def77633b6548da06985cb22955a7e85abac'

* commit '0358def77633b6548da06985cb22955a7e85abac':
  DO NOT MERGE Overscroll continues; asset and behavior tweaks.
tree: a5b01e7714e08c28da6d945bea0296d013cbaccf
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE