28f8857b1b46bde18b85c6d3c2a63ac44c3c2e1c |
|
08-Jul-2009 |
Evan Millar <emillar@google.com> |
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
|