tree cab41db07f9765985a02398ccd659b38dd57ba30
parent 5d531210a282c98994ce8bb46461141f93bcddb8
parent 118d252e7541bfe2c0453814acc3bee0b6312de1
author Michael Kolb <kolby@google.com> 1396397421 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396397421 +0000

am 118d252e: am 4a812147: am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev

* commit '118d252e7541bfe2c0453814acc3bee0b6312de1':
  Add circular anti-aliasing mask to circular display