8 Commits

Author SHA1 Message Date
Kylie Jue
70db4fab5c docs: Added v7 Palette library documentation and images to DAC training.
https://android-dot-devsite.googleplex.com/training/material/palette-colors.html

Bug: 30034142

Change-Id: I1e82b82a84def6ef72e0401418085694d5bbeee2
2016-09-16 10:22:40 -07:00
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Luan Nguyen
6d592518b8 am 8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs
* commit '8b959ee95b4dfa191c6924b3c88fad72b700d81c':
  docs: Remove references to Android Studio 0.8 beta
2015-05-20 23:09:46 +00:00
Luan Nguyen
7e02496311 docs: Remove references to Android Studio 0.8 beta
bug: 21109817
Change-Id: I8cde77651f7dea324aa4ebebdd7cd6437528098a
2015-05-20 09:02:40 -07:00
Dirk Dougherty
6c1c263efa Doc change: merge landing page and header/footer designs.
Change-Id: Ic2f603c0215f8dadac2dfa4b871b22b2f9a027e5
2015-05-03 11:26:59 -07:00
Joe Fernandez
4fee8c89eb docs: Home page - fix card images that are showing up on the home page
Change-Id: I943b9b819f91069f961c5f93b14f01499f587e19
2014-10-25 01:46:20 -07:00
smain@google.com
271078f50d update L preview landing page for 5.0 SDK launch
includes new system images
also update the DAC homepage announcement

Change-Id: I6e249e4ec5ef4b4329b145b334b31cfe11dd136c
2014-10-16 18:48:17 -07:00
Ricardo Cervera
414978a821 docs: Migrating material design info from the Preview site
Change-Id: I3a2f71e41cc1371b8cce2d8860b116cf0f8b8ed2
2014-10-16 17:52:28 -07:00