| commit | 45a4bfaca2751b0ebdd5631c503a49c8d5ff92b5 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Tue Dec 01 18:36:29 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 01 18:36:29 2009 -0800 |
| tree | a8bfecba668567ae467643af46f71a3831808d2c | |
| parent | bf14830692d44ab20f136704953976790cfc5998 [diff] | |
| parent | 8df18d3094ac92edee4edf0b7d885096e2926e37 [diff] |
am 6cc42b70: am 90bca755: resolved conflicts for merge of b64c72df to eclair-mr2 Merge commit '6cc42b70c592d5a112809a0230764819de3c7c12' * commit '6cc42b70c592d5a112809a0230764819de3c7c12': Fix bug 2290852: Screen wakes up in my pocket while listening to music