Fix double end

Change-Id: Ibf4c5fcaa1948a32b275d68602e84a472a0921f8
Settings: Fix value from being overwritten with null.

After awhile this value becomes null for unknown reasons.
Switch back to a non-changing static final for the non-multi-sim case.

Change-Id: I9248a545ed35ec10048781b21a3e6a6b17e96d74
czech translation - string fix
settings: Put MSIM files in the right place

Change-Id: I1e989d710510aff257f5ae3f6f402bb993b8da72
Settings: Day and week on data usage cycle (2/2)

Adds the ability to set day and week on when the data usage graph resets, instead of just month.

Change-Id: I5974e1b7143d09ffd6fcd6db113c3f7511346bfa

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
Settings: Add preference for EdgeGesture service.

Update: Default to true

Change-Id: I0325b0a9aa6eb943b48483aebe151726a2c64ac4

Conflicts:
	res/values/cm_strings.xml
Buttons: Allow disabling hard navigation keys

This adds support for enabling the navbar on devices with
hardware keys.
This requires that the device supports the KeyDisabler
HAF methods, and is available in the Buttons menu

Change-Id: I01bd83b312745b4a8aa3bde0cf5f02ea99a888cc

Conflicts:

	res/values/cm_strings.xml
	res/xml/button_settings.xml
	src/com/android/settings/cyanogenmod/SystemUiSettings.java
Settings: use CMHW serial number for MSim

Change-Id: I2cb7f841699d79259711309fb6fd2de00bc8da75
Settings/Wifi: Add support for Ad-hoc (IBSS) networks

If the WLAN driver can support IBSS mode, show Ad-Hoc (IBSS) networks in the
list of available Wi-Fi networks and allow to connect to or create new Ad-Hoc
networks.

This is merged and ported from CM-10.2, where it was split up into 3 commits.

Change-Id: Ib58d05d05ce00a77d5b88ee57007d38798d7b43d
Fix resource IDs being added to the android namespace

Using @+android:id/some_id will create a new resource ID
with package ID 0x01 rather than 0x7f, for non framework
packages, if "some_id" does not already exist.

Change-Id: I86d57ae6ac88e7dae8420a92e4d55b6c935fd188

Conflicts:

	res/layout/preference_streamvolume.xml
Fix the APN editor fix

The APN creator puts its data in a Bundle, not an Intent. Get the
operator identification argument from the right place to avoid
attempts at creating networkless APNs

Change-Id: I42b6e00fffdeea4ea538d55687cdbb4d2d548127
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
Merge branch 'github/kitkat'

Change-Id: I59d2de257b01b332b2eb4fbd0d15bf250d39ff6c