Dirk Dougherty 9a6672beb1 resolved conflices for merge of 93ccd1a2 to master ...

Change-Id: Ic77367cb9c90027e036a461697295fd604b50014

2014-05-14 14:50:13 -07:00

..

building-blocks

Merge commit '47d3eaf6' into manualmerge

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

downloads

Removing quotes from page.tags values

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

get-started

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

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

media

docs: Watermarked images for codes that weren't found.

2014-04-18 11:54:03 -07:00

patterns

resolved conflices for merge of 93ccd1a2 to master

2014-05-14 14:50:13 -07:00

style

resolved conflices for merge of 93ccd1a2 to master

2014-05-14 14:50:13 -07:00

videos

Doc change: Design guidelines update.

2013-10-31 17:02:33 +00:00

design_toc.cs

Doc change: Design guidelines update.

2013-10-31 17:02:33 +00:00

index.jd

Doc change: Updated content for distribute.

2014-05-14 14:10:51 -07:00