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