Merge branch 'master' into 4.0.x (Fix setPluginEntries)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/05a95c69 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/05a95c69 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/05a95c69 Branch: refs/heads/4.0.x Commit: 05a95c699f3cdc0ebe706b7887eb6faa5946dc74 Parents: 9c5e340 9ea8b22 Author: Andrew Grieve <[email protected]> Authored: Tue Jul 8 11:55:04 2014 -0400 Committer: Andrew Grieve <[email protected]> Committed: Tue Jul 8 11:55:04 2014 -0400 ---------------------------------------------------------------------- framework/src/org/apache/cordova/PluginManager.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/05a95c69/framework/src/org/apache/cordova/PluginManager.java ----------------------------------------------------------------------
