Chris Banes 4b201a5731 resolved conflicts for merge of cbc1ac33 to master ...

Change-Id: I107320a07a1646f2ddc3a288b13ae58c538d96e6

2015-02-18 11:32:48 +00:00

..

about

Adding videos for 5.0 changes and watch face development.

2015-02-10 10:29:36 -08:00

auto

…

channels

…

community

…

design

docs: site mipmap folder updates

2015-02-17 12:34:35 -08:00

develop

…

distribute

docs: Update device art generator to include Wear generic devices.

2015-02-11 11:17:10 -08:00

google

docs: Noted that purchaseToken is long and cannot be truncated.

2015-02-12 17:05:43 -08:00

guide

am e9d86f58: am 9f807e7e: am 6de1fd98: am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989

2015-02-18 11:13:15 +00:00

images

am 85b066cb: am 821bb7fd: am 3a69c24f: am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc

2015-02-18 11:13:23 +00:00

preview

docs: Removing obsolete L-Preview docs and images

2015-01-12 10:20:41 -08:00

reference

am 3fee7dc7: am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc

2015-01-16 22:40:55 +00:00

resources

…

samples

docs: studio sample procedure update

2014-12-19 10:40:55 -08:00

sdk

resolved conflicts for merge of 1c131eeb to master

2015-02-18 11:02:49 +00:00

shareables

…

tools

am e9d86f58: am 9f807e7e: am 6de1fd98: am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989

2015-02-18 11:13:15 +00:00

training

resolved conflicts for merge of cbc1ac33 to master

2015-02-18 11:32:48 +00:00

tv

…

wear

…

_redirects.yaml

…

app.yaml

…

favicon-a.ico

…

favicon.ico

…

gcm_navtree_data.js

…

gms_navtree_data.js

…

googlef295f8c7d59b0d29.html

…

index.jd

…

jd_collections.js

Doc change: Add new analytics information to Distribute.

2015-01-15 16:28:13 -08:00

jd_extras.js

Doc change: Add new analytics information to Distribute.

2015-01-15 16:28:13 -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

…