am ee7e0efc: (-s ours) am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread

Merge commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916'

* commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916':
  DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
tree: 8d8c8b31eb975d7399055448629ec0c0517c7190
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE