lockscreen1
lockscreen targets
Merge branch 'jb-mr1' into lockscreen1
telephony: set additional audioparameters for incall audio

this is the other part to what synced to repo in frameworks_opt_telphony

PatchSet2 : Eliminate Whitespaces
PatchSet3 : Eliminate Whitespaces for real this time

Change-Id: Idfd29591f35bca46cf2180377b90822376aa10ea