Dirk Dougherty a97e177857 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

2014-02-12 19:31:15 -08:00

..

appendix

Removing quotes from page.tags values

2013-11-14 21:00:10 +00:00

components

am c797221f: am 64d14b5c: am 37826fa9: am 4e73847a: am 5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of s

2013-12-17 21:32:12 +00:00

faq

fixup HTML

2013-11-22 10:22:45 -08:00

practices

initial shuffle of the API guide nav to add introduction

2013-12-17 13:14:17 -08:00

samples

…

topics

Merge commit '47d3eaf6' into manualmerge

2014-02-12 19:31:15 -08:00

webapps

…

guide_toc.cs

MediaRouter Developer Guide

2014-02-12 14:12:15 -08:00

index.jd

initial shuffle of the API guide nav to add introduction

2013-12-17 13:14:17 -08:00