| commit | 35ea90deee5050a66909b2740601bd81f9f29780 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Nov 04 16:35:15 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 04 16:35:15 2009 -0800 |
| tree | 90e78184383d8e6d1fa6081c496cd0dd37e4bb09 | |
| parent | 888b702c81b21847b19c4e2845686ed35cc03a0e [diff] | |
| parent | b5e380a799b1c22d51364a2b9b3abe02e2eb83cf [diff] |
am b5e380a7: (-s ours) am e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk Merge commit 'b5e380a799b1c22d51364a2b9b3abe02e2eb83cf' into eclair-mr2 * commit 'b5e380a799b1c22d51364a2b9b3abe02e2eb83cf': Explicitly specify that online-sdk depends on framework-res. (do not merge)