| commit | 385a753dead6ef15f2e30eae47f73e642b3ef7ed | [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 | ae4e55f4c7903e62f23802c7d49ad97ae5b2f0a7 | |
| parent | a376d030a2075909219926d622b71016418d7dcd [diff] | |
| parent | 368fdba47a49f249aa4346edaf3f45291ca6a7ff [diff] |
resolved conflicts for merge of 368fdba4 to master Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d