2 commits

Author	SHA1	Message	Date
Albert Vaca	c7c1974ea9	Merge branch 'master' into frameworks ... Conflicts: core/backends/lan/lanlinkprovider.cpp plugins/ping/pingplugin.h plugins/telephony/telephonyplugin.cpp	2015-01-10 20:14:01 -08:00
Pramod Dematagoda	0779377337	Added a plugin to inhibit the screensaver when a device is connected. ... The inhibition is lifted when the plugin disconnects. REVIEW: 121692	2014-12-29 23:31:25 -08:00