| commit | 2e20f7e478c70dca1bb2d748ed06b5d0f45584ae | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Tue Aug 24 12:40:13 2010 -0700 |
| committer | Brad Fitzpatrick <bradfitz@android.com> | Tue Aug 24 12:40:13 2010 -0700 |
| tree | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 | |
| parent | 761e488b38fc3e9a1154e7b400d6345ebf2848fd [diff] | |
| parent | 4f4ae2aebd61cf246c8dd4b09f27c48f2a0ea9fc [diff] |
resolved conflicts for merge of 0b7b9807 to master Change-Id: If60aeeb47cd06dcc76b88506688c7e4b58cf2208