tree 97cb2fe6206252da5fdd53ee1c6a0dce6b370a09
parent a8cb975aa7c91d0330ac6589884ea9adb3022bc1
parent a4f593d7fb205b56412e3091fb21c592abe934cf
author Michael Kolb <kolby@google.com> 1401819240 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401819240 +0000

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

* commit 'a4f593d7fb205b56412e3091fb21c592abe934cf':
  Fix circular mask