am 4873beb5: am a943634a: Merge "improvement for emma filter option" into gingerbread
am 4873beb5: am a943634a: Merge "improvement for emma filter option" into gingerbread

Merge commit '4873beb5b018d74a3b38403f34628ed6c3435888'

* commit '4873beb5b018d74a3b38403f34628ed6c3435888':
  improvement for emma filter option

fallouttester/platform_manifest,hagar006/platform_manifest,xorware/android_build,RR-msm7x30/platform_manifest,xorware/android_build,xorware/android_build,xorware/android_build,Hybrid-Power/startsync,pranav01/platform_manifest,see4ri/lolili,xorware/android_build,knone1/platform_manifest,ND-3500/platform_manifest