| commit | d8642579381c6e11b2c32cbc11b2249cc692bb6c | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Mon May 17 11:31:54 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 17 11:31:54 2010 -0700 |
| tree | 924202f8f46b4b14e3e63bfdc5be146722f8c05f | |
| parent | c09b7cf1c96d007b35cfa47f464156bf628107de [diff] | |
| parent | c0d8fb5842f57bbc244e9c9596707787caabf44e [diff] |
am c0d8fb58: (-s ours) DO NOT MERGE resolved conflicts for merge of e95aad61 to kraken