| commit | a97e17785714e5155184199161b3d288f13d0134 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Wed Feb 12 19:31:15 2014 -0800 |
| committer | Dirk Dougherty <ddougherty@google.com> | Wed Feb 12 19:31:15 2014 -0800 |
| tree | 721d2cc88db8212cc8b58a407d1d52bd89e53e8b | |
| parent | c462073b24ab7c71e4ba5046c1a28ac27a001d60 [diff] | |
| parent | 47d3eaf6b1d1aec8517bef6da9e8c3561f21d7bd [diff] |
Merge commit '47d3eaf6' into manualmerge Conflicts: docs/html/design/patterns/accessibility.jd docs/html/design/patterns/actionbar.jd docs/html/design/patterns/compatibility.jd docs/html/design/patterns/multi-pane-layouts.jd docs/html/design/style/iconography.jd Change-Id: I349cf8ebc159c0a7ef0796900e2d11fe6e0c888a