Anis Kadri 5faed8378c Merge branch 'master' of github.com:phonegap/phonegap-android ... Conflicts: framework/res/xml/phonegap.xml framework/src/com/phonegap/DroidGap.java		2011-10-14 15:43:13 -07:00
..
phonegap.xml	Merge branch 'master' of github.com:phonegap/phonegap-android	2011-10-14 15:43:13 -07:00
plugins.xml	Include plugin reference and permissions for battery events.	2011-08-11 15:37:11 -05:00