am 6c4609ad: (-s ours) am dfe0870e: Merge "DO NOT MERGE Only show edge glow...
am 6c4609ad: (-s ours) am dfe0870e: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread
Merge commit '6c4609ad'
* commit '6c4609ad':
DO NOT MERGE Only show edge glow effect on 1 side at a time.