tree 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f
parent 86638e0acbaf65e8b90bcc524e3b27f6e3452838
parent 4073b9e1cf5b52e6a2031defa631a0d1c889eb8d
author Mindy Pereira <mindyp@google.com> 1286492675 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286492675 -0700

am dfe0870e: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread

Merge commit 'dfe0870e72574eaffc9a165f01a021149529d9c2' into gingerbread-plus-aosp

* commit 'dfe0870e72574eaffc9a165f01a021149529d9c2':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.