Settings: chnage OTA's activity name

Change-Id: I67b5d6b47807cc034e19958cba5b07a7f8ac2d7f
Merge "Fix search highlight matching in some cases." into kitkat
Fix search highlight matching in some cases.

The attempt at optimizing the loop by skipping the characters that
precede the actual match broke the offset calculations, so the number of
characters skipped in filtering wasn't calculated correctly. Fixit by
removing the misguided optimization.

Example: search for "pera"
highlight in match: Debug non-rectangular cli_p opera_tions
highlight should be: Debug non-rectangular clip o_pera_tions

Change-Id: I07c46b3966e6d81124a5b523c1e822b8750f4f7a
DataUsageSummary: Add CDMA support for showing usage for devices without sim cards

Change-Id: Ib6774b0ad1cd9421a669349321a4f75517f24719
Merge "DataUsageSummary: Add CDMA support for showing usage for devices without sim cards" into kitkat
Settings : Dismiss glowpad view on trigger

Change-Id: If24e67549d4286f34bff8bd7f06cc32d4c56b292
New Sliding Menu Settings style
Merge remote-tracking branch 'ap/kitkat' into kitkat

Conflicts:
	src/com/android/settings/aicp/AicpSettings.java