| commit | c7d2e82e7f55556cbcdb4f5b9c3eba403c1e72e7 | [log] [tgz] |
|---|---|---|
| author | Nicolas Roard <nicolas@android.com> | Tue May 11 10:40:11 2010 -0700 |
| committer | Nicolas Roard <nicolas@android.com> | Tue May 11 10:40:11 2010 -0700 |
| tree | d0626926c0e879e00b323132b1c6eafab0ea9bbc | |
| parent | 78c5bc68d1fd0c86810e9efcc552577f70ed1cb0 [diff] | |
| parent | ca07c170536ba29b14992155ade63dec7f5c3c65 [diff] |
resolved conflicts for merge of bfd6805a to master Change-Id: Ie975e4cd7391d62949c563453358aa999c8a4b45