Settings: HeadsUp timeout (2/2)

AICPfy
Destilled from SlimRom
PS2: fix FC

Change-Id: Idc5c7770a8577b930d02b83ca39e58a195dcf143
ProximityWake : Add support for checking proximity when waking device [2/2]

PS2: Whitespace cleanup on isle 2

Change-Id: Ie4cbfc51fe2e333955f2dc792d473e42d7287343
Update Logo/add LMT
Merge remote-tracking branch 'ap/kitkat' into kitkat