Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87adbaa3 authored by Ben Murdoch's avatar Ben Murdoch Committed by Android Git Automerger
Browse files

am 4c333e17: Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev 

* commit '4c333e17':
  Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE
parents e5e78ccb 4c333e17

core/java/android/webkit/WebView.java

+1 −1
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ public class WebView extends AbsoluteLayout 
     *                 defaults to 'text/html'.

     * @param encoding the encoding of the data

     * @param historyUrl the URL to use as the history entry. If null defaults

     *                   to 'about:blank'.

     *                   to 'about:blank'. If non-null, this must be a valid URL.

     */

    public void loadDataWithBaseURL(String baseUrl, String data,

            String mimeType, String encoding, String historyUrl) {