Commit Graph

6 Commits

Author SHA1 Message Date
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Dirk Dougherty
cd7e7dc423 Doc change: remove design content that has moved to material spec.
Change-Id: I335e3386633ae1e95891980b225885f5fed219b0
2015-05-05 22:27:48 -07:00
Dirk Dougherty
3155825c25 Doc change: minor edits to support easier extraction of document summaries.
Change-Id: I1a15a1d233464d6c8d35a741c54932412dea28ee
2014-02-12 13:31:14 -08:00
Peter Ng
02123630ca Multiple design styleguide fixes
-Changing extras to videos
-new bullet item in swipeviews
-new in 4.0 removal
-Ui overview notification info
-reppling typo fixed

Bug: 6936546
Bug: 6936394
Bug: 6958972
Bug: 6960355
Bug: 6937850
Bug: 6937856
Bug: 6912380
Bug: 6941255
Bug: 6937723
Bug: 5836846
Bug: 6915055
Bug: 6915259
Bug: 6651973
Bug: 6937070
Bug: 6947018
Bug: 6924456
Bug: 6915152
Bug: 6936797
Bug: 6924201
Bug: 6922994
Bug: 6924137
Bug: 6907998
Bug: 6912377
Bug: 6937761
Bug: 6923664
Bug: 6946790
Bug: 6918869

Change-Id: Ic5f39fe5b9f56c911af8bde9a254007748f6530e
2012-08-13 13:22:21 -07:00
Scott Main
50e990c64f Massive clobber of all HTML files in developer docs for new site design
Change-Id: Idc55a0b368c1d2c1e7d4999601b739dd57f08eb3
2012-06-21 21:27:30 -07:00
Roman Nurik
b99ae73cc5 docs: move Android Design from static HTML to JD
Change-Id: I6e451599998cb8b69489cada482ab5db9d71d6f8
2012-03-06 12:26:15 -08:00