| commit | fa12c39ce4b4ee8eabe05dbf2ffcb2a41cd2ac86 | [log] [tgz] |
|---|---|---|
| author | Elly Jones <[email protected]> | Mon Apr 11 15:13:45 2011 |
| committer | Elly Jones <[email protected]> | Mon Apr 11 15:13:45 2011 |
| tree | 07b208ee7863d54f1c435cfd1beb3e55d81fd1f7 | |
| parent | 29462f15ce7a48dfba37497f8aec251051a32700 [diff] | |
| parent | f4a26ec2b6053c44f34f1ac5ee2a8645c4622cb7 [diff] |
Merge remote branch 'upstream/master' into upstream Conflicts: plugins/mm-modem-samsung-gsm.c plugins/mm-plugin-samsung.c Change-Id: Ifb6d581f25df455dab4a5f9087efbbb37f7a96dd