am 560ba6e1: (-s ours) am 08c09b0f: Merge "DO NOT MERGE. Only 1 edge glow...
am 560ba6e1: (-s ours) am 08c09b0f: Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
Merge commit '560ba6e1'
* commit '560ba6e1':
DO NOT MERGE. Only 1 edge glow should be growing at a time.