tree 309866912727ae8f7ae0516d716615f218352b0a
parent 7b7476c7a38357347674f549bff83fd531529c22
parent 1d890971b4fa41b1d01f4967f5706497fa38fe58
author Andrew Flynn <flynn@google.com> 1337376101 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337376101 -0700

am 1d890971: Merge "sw600dp clings" into jb-dev

* commit '1d890971b4fa41b1d01f4967f5706497fa38fe58':
  sw600dp clings