| commit | f72fb68bf32014b075fe577c8495c2c8a86476a9 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Wed Dec 02 19:57:33 2009 -0500 |
| committer | Mike Lockwood <lockwood@android.com> | Wed Dec 02 19:57:33 2009 -0500 |
| tree | 839f2a8a25c0a94a8ba841a881f63101d2ffa3a3 | |
| parent | 2d8b0c3f0fbc3c42063f4e790ca85b86c5d655f0 [diff] | |
| parent | 9b7dba936c24fa7959561ddf1a0c8ba4d2165782 [diff] |
resolved conflicts for merge of 9b7dba93 to eclair-mr2 Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59