Merge branch 'master' of https://git@github.com/wisegps/baba.git

Conflicts:
	src/com/wise/car/CarAddActivity.java
dfsMerge branch 'master' of https://git@github.com/wisegps/baba.git

Signed-off-by: wang <wang@wang-PC>
修改保存图片的精度

Signed-off-by: honesty <371278698@qq.com>
Signed-off-by: honesty <371278698@qq.com>
修改友盟bug

Signed-off-by: honesty <371278698@qq.com>
违章的处理状态去掉

Signed-off-by: honesty <371278698@qq.com>
vbfxkkyrdeaerghtyutyert

Signed-off-by: wang <wang@wang-PC>
Merge branch 'master' of https://git@github.com/wisegps/baba.git

Conflicts:
	AndroidManifest.xml
hdyjkgjlhiokvh

Signed-off-by: wang <wang@wang-PC>
fsdgshhsfawe

Signed-off-by: wang <wang@wang-PC>
Signed-off-by: honesty <371278698@qq.com>
hgfjgykulhugjxdfgg

Signed-off-by: wang <wang@wang-PC>
fdgdfgfhdgjdhj

Signed-off-by: wang <wang@wang-PC>
Merge branch 'master' of git@github.com:wisegps/baba.git
gfdhgjfkigkdfgdfhj

Signed-off-by: wang <wang@wang-PC>
新增清除故障码功能
新增设置震动报警灵敏度功能

Signed-off-by: honesty <371278698@qq.com>
Merge branch 'master' of git@github.com:wisegps/baba.git
Signed-off-by: honesty <371278698@qq.com>
asdfasdfasfdgfdfgdfg

Signed-off-by: wang <wang@wang-PC>
Merge branch 'master' of git@github.com:wisegps/baba.git