| commit | 2bfc6fb6bc4a76f480965f1657e35fe052515882 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 15:22:06 2010 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 15:22:06 2010 -0700 |
| tree | 013d2ccd26189d4f0babcdd06a4c65556ae84611 | |
| parent | d67af368a8b36e7d3c1437279d82bad57ea49219 [diff] | |
| parent | b744fcaabefac4a21e0a5f8cc84f0ceb8d685c05 [diff] |
resolved conflicts for merge of fe953c43 to master Change-Id: Iedf5b55f97f938242e25bcf5098982b2d3e43c68