tree 6411b29ed872d2c5cc01fe3d3f6c7248b567e897
parent d8c2bbd7bcd11eecf5cfca133f894e05f6b9d787
parent 248dc2747ecab5030e3a0967d0e845e16f0d4118
author Andrew Flynn <flynn@google.com> 1339024578 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339024578 -0700

am 248dc274: am 57660325: Merge "Update 600dp clings." into jb-dev

* commit '248dc2747ecab5030e3a0967d0e845e16f0d4118':
  Update 600dp clings.