resolved conflicts for merge of a798dd86 to donut

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/com/google/android/util/GoogleWebContentHelper.java b/core/java/com/google/android/util/GoogleWebContentHelper.java
index 3cdf85592970..8291e2964dc1 100644
--- a/core/java/com/google/android/util/GoogleWebContentHelper.java
+++ b/core/java/com/google/android/util/GoogleWebContentHelper.java
@@ -131,6 +131,10 @@ public class GoogleWebContentHelper {
         return this;
     }
 
+    /**
+     * Loads data into the webview and also provides a failback url
+     * @return This {@link GoogleWebContentHelper} so methods can be chained.
+     */
     public GoogleWebContentHelper loadDataWithFailUrl(String base, String data, 
         String mimeType, String encoding, String failUrl) {
         ensureViews();