Merge branch 'kitkat' of github.com:AOKP/packages_apps_Settings into kitkat
Merge tag 'android-4.4.3_r1.1'

Android 4.4.3 release 1.1
Merge branch 'kitkat' of github.com:AOKP/packages_apps_Settings into kitkat
Merge tag 'android-4.4.3_r1.1'

Android 4.4.3 release 1.1
Merge branch 'kitkat' of github.com:AOKP/packages_apps_Settings into kitkat
Merge branch 'kitkat_mr2' of github.com:AOKP/packages_apps_Settings into kitkat
Settings: Modify AOSP JA translation

usage_type_on_time is supposed to the cell standby use time(使用時間),
but it says screen use time(点灯時間) in Japanese. It should be corrected.

Change-Id: Ic9b7f61a054d09cf7944d6d37f70c8dbb294c095
NFC Polling Mode (2/3)

Change-Id: I0e17ded93e9b82095e6bf8301c268017c49dd12b
Signed-off-by: Jubakuba <Jubakuba@gmail.com>
Merge branch 'kitkat' of github.com:AOKP/packages_apps_Settings into HEAD
Merge branch 'kitkat' of https://github.com/task650/packages_apps_Settings into HEAD