| commit | 36cdee48ec8ee2fb107d079d16fe6f6c56beeced | [log] [tgz] |
|---|---|---|
| author | Tom Taylor <tomtaylor@google.com> | Wed Jul 21 11:22:22 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 21 11:22:22 2010 -0700 |
| tree | 1d726b7b3320d5ba9d210eba530bb7b069e22e58 | |
| parent | 976f08643c42d9fb6bb4cc1c622454c64ce46126 [diff] | |
| parent | 468c4f6de9c92bdf3a665be2fe4c07a19c633d45 [diff] |
am dbac180d: Fix a merge problem with html mms Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread * commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff': Fix a merge problem with html mms