tree b85c72450b8a2929dabfc125a7582252682f8442
parent 060e25bf124c530423c589622c220828a7f35086
parent 242fa52bb6d4556c7cb4bcb1880210f076ea7270
author Patrick Dubroy <dubroy@google.com> 1286241824 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286241824 -0700

am 242fa52b: am eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread

Merge commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270'

* commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270':
  Fix 2-pixel offset unlock jog tab