You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/10/21 19:00:31 UTC

[8/8] android commit: Merge branch 'master' into 4.0.x (gradle signing+SecureRandom)

Merge branch 'master' into 4.0.x (gradle signing+SecureRandom)


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/cc7d3522
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/cc7d3522
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/cc7d3522

Branch: refs/heads/4.0.x
Commit: cc7d352209e3f6d841fe631a510e6288cbe308b1
Parents: 7ad16e5 ce5d9a2
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Oct 21 13:00:07 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Oct 21 13:00:07 2014 -0400

----------------------------------------------------------------------
 bin/templates/project/build.gradle              | 27 ++++++++++++++++----
 .../src/org/apache/cordova/CordovaBridge.java   |  5 +++-
 2 files changed, 26 insertions(+), 6 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org