Settings : Dismiss glowpad view on trigger

Change-Id: If24e67549d4286f34bff8bd7f06cc32d4c56b292
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Settings: Modify AOSP JA translation

Change-Id: I0994f6148e99d1b479640ead076fb307f225bd66
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Automatic translation import

Change-Id: Id47e0dcee33861c2c40110b924057b257050e0dd
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Settings : Filter spam notifications

Change-Id: I4056aceada3cf8397827037bcb52388de9f8b9fc
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Highlight all search matches for the given constraint.

Change-Id: I9f1a58ee3e6cd59522c4705bedb1457473201d3c
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Settings: Fix camel case

Change-Id: Ibc74affb90757f0680e9ce2aa15bc9c4596ec28b
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of https://github.com/androidarmv6/android_packages_apps_Settings into cm-11.0