commit | b611b7c8d5d6ebeae1b2fed65eb25f5aa684763a | [log] [tgz] |
---|---|---|
author | Mindy Pereira <mindyp@google.com> | Sun Sep 26 18:45:48 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 26 18:45:48 2010 -0700 |
tree | 800f5a1d1fb7681c43ecec78617fed1e30c80f99 | |
parent | 1f0d3963d65d092d2a0ed6e38b4223243290f183 [diff] | |
parent | 560ba6e1a9dbd8a57fdee2040185981162ed09d6 [diff] |
am 560ba6e1: (-s ours) am 08c09b0f: Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread Merge commit '560ba6e1a9dbd8a57fdee2040185981162ed09d6' * commit '560ba6e1a9dbd8a57fdee2040185981162ed09d6': DO NOT MERGE. Only 1 edge glow should be growing at a time.