| commit | 71e19f0e387804aacd6c99a092938434afb4fff5 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Mon May 18 21:27:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 18 21:27:47 2015 +0000 |
| tree | 691ce102fb0d7c478b05a0737918e8f54a95f77f | |
| parent | 62329511af033dff183fc31925e3f399db8e653a [diff] | |
| parent | 05f803377ebcf2f9c6160fa125948598f0558113 [diff] |
am 05f80337: resolved conflicts for merge of ab6d5376 to mnc-dev * commit '05f803377ebcf2f9c6160fa125948598f0558113': Doc change: adjust distribute and preview card grids and styles.