| commit | 28f8857b1b46bde18b85c6d3c2a63ac44c3c2e1c | [log] [tgz] |
|---|---|---|
| author | Evan Millar <emillar@google.com> | Wed Jul 08 14:58:53 2009 -0700 |
| committer | Evan Millar <emillar@google.com> | Wed Jul 08 16:46:00 2009 -0700 |
| tree | 679f09f13a62945e51cbae9f034f987520905664 | |
| parent | 47a99760251f02a63b1c5bb8a51c7457ee4c2626 [diff] | |
| parent | ca8172420c0913dff96ea607d477d8b8abfe5ddb [diff] |
Merge commit 'goog/eclair-dev' into merge3 Merged the new contacts content provider into goog/master. The old and new content providers now live side by side under separate authorities. Conflicts: Android.mk AndroidManifest.xml res/values/strings.xml