| commit | d0bc3ad8aecf2d33489b98f217d10b8d6057d7c2 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Jun 28 18:58:23 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 28 18:58:23 2011 -0700 |
| tree | 0154a39d8c1b08efb8d5291b8ff940cee9997e4c | |
| parent | e28fbd61d8692e4b8df34ae3971e65e309bf2108 [diff] | |
| parent | d7542263c6dfa2522e8844c7c714fbf2ad112385 [diff] |
am d7542263: (-s ours) am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread * commit 'd7542263c6dfa2522e8844c7c714fbf2ad112385': CherryPick 988eeeb5 from hc-mr1. do not merge.