am abcbb1a1: Fix bug 3061544 and some clipping errors.

Merge commit 'abcbb1a1989e8c6adec607b3964dc187f5526e66' into gingerbread-plus-aosp

* commit 'abcbb1a1989e8c6adec607b3964dc187f5526e66':
  Fix bug 3061544 and some clipping errors.