commit a5bf5b3a2a695ac307ebe1be27f420d93a657bb4
author Baligh Uddin <baligh@google.com> Tue Sep 03 22:10:53 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 03 22:10:53 2013 -0700
tree c6ff43162ab75b9fbb6d3d8110a1db70856b5910
parent ce8a3164b3ce23ae860ec9ccef20ef8a66d840d2
parent a797e4669ee2c1243438ea22197fd5cdf8e1038d

am a797e466: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10

* commit 'a797e4669ee2c1243438ea22197fd5cdf8e1038d':
  Import translations. DO NOT MERGE

src/com/android/mail/browse/ConversationCursor.java

diff --git a/src/com/android/mail/browse/ConversationCursor.java b/src/com/android/mail/browse/ConversationCursor.java
index b648804..15457ab 100644
--- a/src/com/android/mail/browse/ConversationCursor.java
+++ b/src/com/android/mail/browse/ConversationCursor.java
@@ -1946,6 +1946,15 @@
     }
 
     @Override
+    public Uri getNotificationUri() {
+        if (mUnderlyingCursor == null) {
+            return null;
+        } else {
+            return mUnderlyingCursor.getNotificationUri();
+        }
+    }
+
+    @Override
     public void setNotificationUri(ContentResolver cr, Uri uri) {
         throw new UnsupportedOperationException();
     }