am 08c09b0f: Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread

Merge commit '08c09b0f84b23627b4cd02e1b9a642952fbd2e7f' into gingerbread-plus-aosp

* commit '08c09b0f84b23627b4cd02e1b9a642952fbd2e7f':
  DO NOT MERGE. Only 1 edge glow should be growing at a time.