am 576a0d14: Merge "Fix circular mask" into klp-modular-dev

* commit '576a0d14e19dae9fa6aa50e0bb836a1da793ef21':
  Fix circular mask
tree: 4b1bf7c43eddc14cd87697d9c76cfa60d96cc073
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml