Update packages/SystemUI/res/values-fr/strings.xml
Merge pull request #13 from AirOne70/patch-3

Update some French Translations
Revert GPS changes for now until issues are resolved.

Will do a refactoring to better isolate this code.

Revert "GPS fixes"

This reverts commit 84c6741f03118168aa61f2e028efae2ea4953a9f.

Revert "Squashed commit of GPS changes from CodeAurora"

This reverts commit 669786140ea7579dcbe05eb2d5199ebf161239a1.

Change-Id: Ib1a55d1be8dbc933c690b2f06af206ab5511903c

Conflicts:
	services/jni/com_android_server_location_GpsLocationProvider.cpp

Conflicts:
	services/jni/com_android_server_location_GpsLocationProvider.cpp
Fixed SQLite possibly crashing processes on some devices

SQLite recreation creates issues

Change-Id: Ie5140499a36e7487c64e3cb4c9a2477a490d7747
Merge branch 'jellybean' of https://github.com/XYAOSP/frameworks_base into jellybean
Merge remote-tracking branch 'xy/jellybean' into franco