diff options
| author | Tom Taylor <tomtaylor@google.com> | 2010-07-21 11:22:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-21 11:22:22 -0700 |
| commit | 36cdee48ec8ee2fb107d079d16fe6f6c56beeced (patch) | |
| tree | 1d726b7b3320d5ba9d210eba530bb7b069e22e58 | |
| parent | 976f08643c42d9fb6bb4cc1c622454c64ce46126 (diff) | |
| parent | 468c4f6de9c92bdf3a665be2fe4c07a19c633d45 (diff) | |
| download | frameworks_native-36cdee48ec8ee2fb107d079d16fe6f6c56beeced.zip frameworks_native-36cdee48ec8ee2fb107d079d16fe6f6c56beeced.tar.gz frameworks_native-36cdee48ec8ee2fb107d079d16fe6f6c56beeced.tar.bz2 | |
am dbac180d: Fix a merge problem with html mms
Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread
* commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff':
Fix a merge problem with html mms
0 files changed, 0 insertions, 0 deletions