| commit | ea5ea98eb1fcb5a12a162ea0021dd6b56db5e0be | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Tue Dec 01 21:21:06 2009 -0500 |
| committer | Mike Lockwood <lockwood@android.com> | Tue Dec 01 21:21:06 2009 -0500 |
| tree | a8bfecba668567ae467643af46f71a3831808d2c | |
| parent | f791330dd15a350003af3304a62010b4e304f157 [diff] | |
| parent | c72b15f2ee751e7cb747e0b53ddecc9da69c9e0c [diff] |
resolved conflicts for merge of b64c72df to eclair-mr2 Change-Id: If3c6a28281b08464fd3f24e752f5e07f6f8a420e