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

..

building-blocks

Merge commit '47d3eaf6' into manualmerge

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

downloads

…

get-started

Doc change: minor edits to support easier extraction of document summaries.

2014-02-12 13:31:14 -08:00

media

Doc change: update download progress image.

2013-11-21 09:49:40 -08:00

patterns

Merge commit '47d3eaf6' into manualmerge

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

style

Merge commit '47d3eaf6' into manualmerge

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

videos

…

design_toc.cs

…

index.jd

Doc change: minor edits to support easier extraction of document summaries.

2014-02-12 13:31:14 -08:00