am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread

Merge commit '106950f20bd352ed72ddf4490b2e19d305e36a74' into gingerbread-plus-aosp

* commit '106950f20bd352ed72ddf4490b2e19d305e36a74':
  DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
tree: 8a2ad642b3eb79903546ed32f689a47927a9a405
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE