tree 6b567d3c7cf77c4406f885ba17fd592ae9689a94
parent 445505f1d0e03f41d227c45b88414ad063c4b814
parent 5951d1ea0d7a85da510eb06f8b73e62113ef800a
author Scott Main <smain@google.com> 1373923379 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373923379 -0700

am 5951d1ea: am d67d0227: Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev

* commit '5951d1ea0d7a85da510eb06f8b73e62113ef800a':
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots