Rich Slogar 0820394f7e resolved conflicts for merge of edf44562 to mnc-dev ...

Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676

2015-04-30 14:20:12 -07:00

..

about

…

auto

…

channels

…

community

…

design

…

develop

…

distribute

docs: Modify Branding guidelines for Android form factors

2015-04-27 15:16:41 -07:00

google

Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs

2015-04-28 00:00:09 +00:00

guide

am c15736b9: am c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs

2015-04-30 03:14:13 +00:00

images

resolved conflicts for merge of edf44562 to mnc-dev

2015-04-30 14:20:12 -07:00

preview

…

reference

…

resources

…

samples

…

sdk

resolved conflicts for merge of edf44562 to mnc-dev

2015-04-30 14:20:12 -07:00

shareables

…

tools

resolved conflicts for merge of edf44562 to mnc-dev

2015-04-30 14:20:12 -07:00

training

Merge "Align AndroidKeyStore API with user auth API." into mnc-dev

2015-04-29 01:25:32 +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

…

jd_extras.js

…

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

…