OSDN Git Service

am d67d0227: Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev
authorScott Main <smain@google.com>
Mon, 15 Jul 2013 21:21:00 +0000 (14:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Jul 2013 21:21:00 +0000 (14:21 -0700)
* commit 'd67d02274da846184449ac02aba7eafdcba889b1':
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots


Trivial merge