1
Merge branch 'master' of https://github.com/fbinba3955/Android.git

Conflicts:
	gen/com/sac/micro/R.java
baiduweather