CPU Frequency stuff
cpu freq stuff
cpu freq stuff
Merge branch 'master' of https://github.com/ruw/WACI-Logger

Conflicts:
	Logger/bin/Logger.apk
	Logger/bin/classes.dex
	Logger/bin/classes/cmu/waci/logger/InteractivityService$1.class
	Logger/bin/classes/cmu/waci/logger/InteractivityService$2.class
	Logger/bin/classes/cmu/waci/logger/InteractivityService$InteractBinder.class
	Logger/bin/classes/cmu/waci/logger/InteractivityService$InteractivityListener.class
	Logger/bin/classes/cmu/waci/logger/InteractivityService$InteractivityView.class
	Logger/bin/classes/cmu/waci/logger/InteractivityService.class
	Logger/bin/classes/cmu/waci/logger/LoggerActivity.class
	Logger/bin/resources.ap_
	Logger/src/cmu/waci/logger/InteractivityService.java
	Logger/src/cmu/waci/logger/LoggerActivity.java