| commit | 01d2087c87627df5bfc7e684f62466e0a662197a | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Nov 18 17:07:11 2009 -0800 |
| committer | Xavier Ducrohet <xav@android.com> | Wed Nov 18 17:07:11 2009 -0800 |
| tree | 5c158fdb0c5f8b796b34680a17bb19ed448d9ef3 | |
| parent | 20d0327492490b676a0a1036754e7742fb92bb69 [diff] | |
| parent | 19cb54ea7da270254852dcd1f476fe1becf1e8a9 [diff] |
resolved conflicts for merge of 19cb54ea to eclair Change-Id: I182195aeaad88aebc82988b1cec9ebda0c359bc8