tree 4c355db7bf3458578e7cd669432c88bef436e442
parent 39b167a644f3859a59e814662295c9247b77f0b9
parent b71f9f96f7f464267c59a80add495388338ced04
author Prashant Malani <pmalani@google.com> 1421088056 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421088056 +0000

am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev

* commit 'b71f9f96f7f464267c59a80add495388338ced04':
  Improve the circularMask for round displays