| commit | 443e4bc646d5baf9a96745bf8ed9d97a73696a98 | [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 | a54f4e7df9f004f79abb683ac586ce1a4f63f6d6 | |
| parent | 066a9f154d3871dde56c3323bf936a6a41419c79 [diff] | |
| parent | 7981a338faeaaa419102d9ef5ed973f1cfc7224f [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.