Ian Rogers 7cb5f9699b am 7f8d94f4: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp ...

* commit '7f8d94f4117021531a388cf2b382ec66d77a3c99':
  docs: squashed commit of i.o launches

2014-06-14 09:44:21 +00:00

..

building-blocks

Merge commit '47d3eaf6' into manualmerge

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

downloads

…

get-started

…

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

tv

docs: squashed commit of i.o launches

2014-06-14 00:39:05 -07:00

videos

…

design_toc.cs

docs: squashed commit of i.o launches

2014-06-14 00:39:05 -07:00

index.jd

Doc change: Updated content for distribute.

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