resolved conflicts for merge of ad94a983 to master

2009-07-10 14:13:37 -07:00
parent 9090ff7937 ad94a98364
commit c8e852da32
3 changed files with 17 additions and 10 deletions
--- a/tests/AndroidTests/src/com/android/unit_tests/UriTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/UriTest.java
@@ -499,4 +499,8 @@ public class UriTest extends TestCase {

        assertEquals(uriString, uri.toString());
    }
+
+    public void testEmptyToStringNotNull() {
+        assertNotNull(Uri.EMPTY.toString());
+    }
 }