tree 8312b4f8b69f3b2c803c887c15971246af49cfda
parent 6394abe56a9a7317627777442dd9b200e50cf7b4
parent ceca4ff1891baf033cd9d6951ec5a1d31473642f
author Andrew Flynn <flynn@google.com> 1337106915 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337106915 -0700

am ceca4ff1: Merge "Support for 600dp & custom clings" into jb-dev

* commit 'ceca4ff1891baf033cd9d6951ec5a1d31473642f':
  Support for 600dp & custom clings