Robert Ly b4590b4550 resolved conflicts for merge of 99c3605c to master ...

Change-Id: I9da7fcad19c3fe85fddb61c5c58b1482417d461a

2014-04-15 09:14:19 -07:00

..

about

dashbaord update for 4/1/14

2014-04-01 10:39:42 -07:00

channels

Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.

2013-11-19 17:55:49 -08:00

community

add Android Community page

2013-12-06 15:48:22 -08:00

design

am 653aa40e: am 7b190e0f: am 22b483ee: am bbaf11f4: update viewport variable with new underscore format

2014-03-27 20:25:52 +00:00

develop

update viewport variable with new underscore format

2014-03-27 13:01:56 -07:00

distribute

am 653aa40e: am 7b190e0f: am 22b483ee: am bbaf11f4: update viewport variable with new underscore format

2014-03-27 20:25:52 +00:00

google

resolved conflicts for merge of 99c3605c to master

2014-04-15 09:14:19 -07:00

guide

am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

2014-04-04 19:34:11 +00:00

images

am 80790fe0: am 7186228a: am d1f51fda: am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs

2014-04-11 16:21:22 +00:00

reference

Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs

2014-03-21 23:55:34 +00:00

resources

…

samples

am b9378d81: am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages.

2014-02-13 11:27:30 +00:00

sdk

am 8490cc15: am 3d9a3b58: am 7abc67f4: am 2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs

2014-04-11 16:21:28 +00:00

shareables

…

tools

am 80790fe0: am 7186228a: am d1f51fda: am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs

2014-04-11 16:21:22 +00:00

training

am f403d60f: am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs

2014-04-05 22:45:01 +00:00

wear

laptop image with redacted

2014-03-31 20:40:34 -07:00

_redirects.yaml

Point bitmaps training class to new samples directory.

2014-03-20 14:56:41 +08:00

app.yaml

…

favicon-a.ico

…

favicon.ico

…

gcm_navtree_data.js

Doc change: refresh GCM reference docs.

2013-08-01 16:15:21 -07:00

gms_navtree_data.js

docs: Added Javadoc for Gcore Jarlsberg release.

2014-03-13 17:33:09 -07:00

googlef295f8c7d59b0d29.html

…

index.jd

update viewport variable with new underscore format

2014-03-27 13:01:56 -07:00

legal.jd

docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key.

2014-01-06 15:31:09 -08:00

license.jd

Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.

2013-11-19 17:55:49 -08:00

offline.jd

Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.

2013-11-19 17:55:49 -08:00

robots.txt

update robots.txt to disallow the community/ pages

2013-12-06 16:08:01 -08:00

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

sitemap.txt

update action bar icon pack with xxhdpi assets

2013-09-26 12:30:30 -07:00

support.jd

add Google+ links to support page

2013-11-20 15:33:33 -08:00