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

Merge commit 'a943634afaf64ad2188fc8ecfb54daed40350be2' into gingerbread-plus-aosp

* commit 'a943634afaf64ad2188fc8ecfb54daed40350be2':
  improvement for emma filter option