OSDN Git Service

Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev
authorScott Main <smain@google.com>
Mon, 15 Jul 2013 21:15:25 +0000 (21:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 15 Jul 2013 21:15:26 +0000 (21:15 +0000)
commitd67d02274da846184449ac02aba7eafdcba889b1
treea156a40c76c0ddd2d42fcae3b911bcfdd0f503e4
parent988251c92269676c891dcb548fecdc100755b431
parente80ddbe976eae576de3c9c32d45c2f2a35097887
Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev

* changes:
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots