Dirk Dougherty 40e6ac9166 resolved conflicts for merge of 45fed517 to mnc-dev ...

Change-Id: I08e44ee778436e5592e73ced82356f015cbdfe74

2015-05-13 11:33:26 -07:00

..

about

am 722b509d: am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs

2015-05-04 22:19:56 +00:00

auto

Doc change: merge landing page and header/footer designs.

2015-05-03 11:26:59 -07:00

channels

…

community

…

design

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

develop

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

distribute

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

google

Doc change: merge landing page and header/footer designs.

2015-05-03 11:26:59 -07:00

guide

am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

2015-05-12 17:48:30 +00:00

images

resolved conflicts for merge of 45fed517 to mnc-dev

2015-05-13 11:33:26 -07:00

preview

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

reference

am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation.

2015-05-05 23:39:28 +00:00

resources

…

samples

Doc change: merge landing page and header/footer designs.

2015-05-03 11:26:59 -07:00

sdk

resolved conflicts for merge of 45fed517 to mnc-dev

2015-05-13 11:33:26 -07:00

shareables

…

tools

am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

2015-05-12 17:48:30 +00:00

training

am ce4408a1: am a7577843: am d43ec638: am 174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented un

2015-05-11 22:16:36 +00:00

tv

Doc change: merge landing page and header/footer designs.

2015-05-03 11:26:59 -07:00

wear

Doc change: merge landing page and header/footer designs.

2015-05-03 11:26:59 -07:00

_redirects.yaml

…

app.yaml

…

favicon-a.ico

…

favicon.ico

…

gcm_navtree_data.js

…

gms_navtree_data.js

cherrypick from lmp-docs. docs: Added 3rd-party Javadocs for GMS

2015-04-22 16:43:05 -07:00

googlef295f8c7d59b0d29.html

…

index.jd

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

jd_collections.js

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

jd_extras.js

Doc change: add new engagement and other distribute files.

2015-05-12 20:42:10 -07:00

jd_tag_helpers.js

docs: M Preview landing page

2015-05-06 23:19:23 -07:00

legal.jd

…

license.jd

…

offline.jd

…

resources.jd

…

robots.txt

…

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

sitemap.txt

…

support.jd

…