OSDN Git Service

am 05f80337: resolved conflicts for merge of ab6d5376 to mnc-dev
authorDirk Dougherty <ddougherty@google.com>
Mon, 18 May 2015 21:27:47 +0000 (21:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 May 2015 21:27:47 +0000 (21:27 +0000)
commit71e19f0e387804aacd6c99a092938434afb4fff5
tree691ce102fb0d7c478b05a0737918e8f54a95f77f
parent62329511af033dff183fc31925e3f399db8e653a
parent05f803377ebcf2f9c6160fa125948598f0558113
am 05f80337: resolved conflicts for merge of ab6d5376 to mnc-dev

* commit '05f803377ebcf2f9c6160fa125948598f0558113':
  Doc change: adjust distribute and preview card grids and styles.