tree dff1423df7eb4a8912f7a9079d72d8e9e4e8e38c
parent 1dc93acf3a4a7cf9ede43e5d2d03fc5c7ff8071e
parent c65dfef3f5ee07883446be0e6907f15fe457da9d
author John Spurlock <jspurlock@google.com> 1384808185 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384808185 -0800

am c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev

* commit 'c65dfef3f5ee07883446be0e6907f15fe457da9d':
  Use scaled display size in wallpaper constraint.