Fix some merging mistakes

Change-Id: Ia3a96151e493efad63cb56ffb9446cfc20da705c
Framework: Generic Blacklist support (4 of 5)

Change-Id: Id6c85c9a537713ec77d00deb7f7fe5a9150be2cd
Fix notification pulldown

Change-Id: I089ea55cf0cb616eaec6ba6f8c593276d5ae11da
Recents : Fix clear all layout

Fixes the clear button from getting cut off due to the added
fitsSystemWindows in aosp

Change-Id: Id43a3d0640f66c1d7c587cb272bc3a6ad520628b
SystemUI: Fix aapt warning

Change-Id: Ie7e4357de2cfe909e761ac94f1ba7a903dd397ed
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Telephony: fix typo

Change-Id: Ic13235744fca561cff4d49ae5c799420c30a3840
SettingsProvider: Add a default for the dialer's autocomplete

... and flip it on

Change-Id: I9ff8d3fdb682292a89606856c8851b5eed197f06
Merge branch 'cm-10.2' of git://github.com/PAC-man/android_frameworks_base into PAC4.3