merge files
Merge branch 'taintdroid-4.1.1_r6' of github.com:jikk/android_platform_packages_apps_GPSApp into taintdroid-4.1.1_r6