| commit | c6a98bb73d9ba63c8490fd522eb19638e7296834 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Thu Oct 21 07:39:10 2010 -0700 |
| committer | Brad Fitzpatrick <bradfitz@android.com> | Thu Oct 21 07:39:10 2010 -0700 |
| tree | 54b76e53206c2793446cf8721ef56ae37919ca70 | |
| parent | e0435c21567624ebdd9e83e2b835480fe538aea1 [diff] | |
| parent | ef156e6ab6c79c1ef9058c3b8641e71d6cbc29b7 [diff] |
resolved conflicts for merge of 368fdba4 to master Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d