Projects >> platform_frameworks_base >>e8939bb8f1453b44788d4475a8263082d858e533

Chunk
Conflicting content
        return this;
    }

<<<<<<< HEAD
=======
    /**
     * Loads data into the webview and also provides a failback url
     * @return This {@link GoogleWebContentHelper} so methods can be chained.
     */
>>>>>>> a798dd86295191b095aaa7a02903daf8d1a5e431
    public GoogleWebContentHelper loadDataWithFailUrl(String base, String data, 
        String mimeType, String encoding, String failUrl) {
        ensureViews();
Solution content
        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();
File
GoogleWebContentHelper.java
Developer's decision
Version 2
Kind of conflict
Comment