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

Change-Id: Ic77367cb9c90027e036a461697295fd604b50014

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

..

branding.jd

…

color.jd

…

devices-displays.jd

Doc change: Updated content for distribute.

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

iconography.jd

…

index.jd

…

metrics-grids.jd

Doc change: Updated content for distribute.

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

themes.jd

…

touch-feedback.jd

…

typography.jd

Doc change: Updated content for distribute.

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

writing.jd

…