Merge branch 'master' into 4.0.x (CordovaUriHelper visibility)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/84bf2015 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/84bf2015 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/84bf2015 Branch: refs/heads/4.0.x Commit: 84bf20152b611a032e970d1783fed2ce63bc64a6 Parents: 200e9f1 d51abdd Author: Andrew Grieve <[email protected]> Authored: Tue Jul 8 12:06:04 2014 -0400 Committer: Andrew Grieve <[email protected]> Committed: Tue Jul 8 12:06:04 2014 -0400 ---------------------------------------------------------------------- framework/src/org/apache/cordova/CordovaUriHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/84bf2015/framework/src/org/apache/cordova/CordovaUriHelper.java ----------------------------------------------------------------------
