| commit | a85ff47d45e230d7360c796b18d5757167c22152 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@android.com> | Wed Aug 26 11:13:37 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 11:13:37 2009 -0700 |
| tree | 7d2f65ecbbc1f0bdd6c5ca312ca8dd9b2aee966f | |
| parent | 9aa4927072a1e2ab2640a3f9a6e5d6150d0c026d [diff] | |
| parent | ed96e88850b471d4ebbbdd1c2acd3efdc6b19a10 [diff] |
am ed96e888: resolved conflicts for merge of 6dd2ae02 to eclair Merge commit 'ed96e88850b471d4ebbbdd1c2acd3efdc6b19a10' * commit 'ed96e88850b471d4ebbbdd1c2acd3efdc6b19a10': turn down allowed image size