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

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