am ee7e0efc: (-s ours) am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and...
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 'ee7e0efc'
* commit 'ee7e0efc':
DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll