Support for 600dp & custom clings

Change-Id: Ifea85be6ff062c61664a3f0ec6c1c24a1fc7b559
9 files changed