Fix PhabletUI

Change-Id: I044225b0741de5e9d928bbac199f0934356b9275
Fix merge error to build VoicePlus, and some minor clean up

Adding this missing line to ISms.aidl fixes build errors for VoicePlus

Change-Id: If2055a8f740c9f2e9c3db9f80db5f752f040e859
Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter.

This fix ensures that onFinished() is always called in a syncClient
even if the application lacks the READ_SYNC_SETTINGS permission.

Change-Id: I08ab930c5695dd874227704a54581baae55d281c
Re-add auto brightness configuration UI (1/2)

Change-Id: I457a05983d692098b4f5708e5a75418eafe4d987
Allow adjusting progress on touch events.

Change-Id: Ide0a7ae057a62f3631a32eeaa63f3e04dec5bf54
And some more merge fixes

Change-Id: I6d3471c20e55776e75f3474b57c7db052d04b995
Misc. cleanup.

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