tree 309866912727ae8f7ae0516d716615f218352b0a
parent 74d2f5ca7b7b17db8aa715d2b2e6938fbfeb5c86
parent 8769126c3b92963bfed96e4ab062806b3403ac0a
author Andrew Flynn <flynn@google.com> 1337629510 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337629510 -0700

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

* commit '8769126c3b92963bfed96e4ab062806b3403ac0a':
  sw600dp clings