Andreas Gampe b3fd7e1be6 resolved conflicts for merge of d93f4c8b to master ...

Change-Id: Iec5cabbeb128a4696a8a670afbf2f4cb9ebdb2de

2015-03-12 22:51:01 -07:00

..

about

Fix build: Revert "docs: Android 5.1 API Release notes (Lollipop MR1)"

2015-03-02 23:03:09 -08:00

auto

Revert "docs: Update auto landing and design page image assets"

2015-03-11 16:20:52 +00:00

channels

…

community

…

design

docs: mipmap link updates

2015-02-19 10:48:37 -08:00

develop

…

distribute

Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

2015-02-23 18:02:26 +00:00

google

Merge "Re-fixing link, and removing trailing white space." into lmp-docs

2015-03-05 22:00:22 +00:00

guide

Merge "Correct docs to specify leading slash in paths."

2015-03-10 22:08:28 +00:00

images

am 89d0c0fb: am bcea1fcd: am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs

2015-03-10 15:47:43 +00:00

preview

…

reference

am 0d258a93: am 737d3cc0: am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs

2015-03-11 23:57:40 +00:00

resources

…

samples

…

sdk

am 964b4018: am 40055c22: am 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs

2015-03-12 21:33:21 +00:00

shareables

…

tools

resolved conflicts for merge of d93f4c8b to master

2015-03-12 22:51:01 -07:00

training

am fd9d8c7b: am e5fd6c76: am 3d950de4: am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"

2015-03-12 21:33:14 +00:00

tv

…

wear

am a05634ff: am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs

2015-03-09 18:12:52 +00:00

_redirects.yaml

Update Google Play brand-info page.

2015-02-20 16:33:48 -08:00

app.yaml

…

favicon-a.ico

…

favicon.ico

…

gcm_navtree_data.js

…

gms_navtree_data.js

…

googlef295f8c7d59b0d29.html

…

index.jd

…

jd_collections.js

Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

2015-02-27 03:41:51 +00:00

jd_extras.js

doc: Add Japanese version of DAC/distribute/ page.

2015-02-18 20:31:05 -08:00

jd_tag_helpers.js

…

legal.jd

…

license.jd

…

offline.jd

…

resources.jd

…

robots.txt

…

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

sitemap.txt

…

support.jd

…