am 58d30b69: am 1864d01f: Merge change Iae849da2 into eclair

Merge commit '58d30b69071363aba38307bc5ee3b2d81f22f09d' into eclair-mr2-plus-aosp

* commit '58d30b69071363aba38307bc5ee3b2d81f22f09d':
  add table maskfilter