Katie McCormick 94c529b8d1 am 385bb2eb: resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev ...

* commit '385bb2eb5184686c2d953fe4757522e61acb3392':
  Doc change: collapse key fix.

2013-08-09 19:31:19 -07:00

..

about

dashboard update for 8/1

2013-08-01 15:49:20 -07:00

channels

Revert "docs: add link to developer survey on main landing pages"

2013-07-30 12:28:43 -07:00

design

Revert "docs: add link to developer survey on main landing pages"

2013-07-30 12:28:43 -07:00

develop

Revert "docs: add link to developer survey on main landing pages"

2013-07-30 12:28:43 -07:00

distribute

fix misc broken links

2013-08-01 11:31:38 -07:00

google

resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev

2013-08-09 17:55:05 -07:00

guide

am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs

2013-08-08 10:20:40 -07:00

images

resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev

2013-08-09 17:55:05 -07:00

reference

Doc change: fix federated urls.

2013-08-06 10:01:24 -07:00

resources

…

sdk

update sizes/sums for tools 22.0.5 release

2013-07-30 10:10:22 -07:00

shareables

…

tools

new class on using action bar for training basics

2013-08-01 14:56:00 -07:00

training

docs: OpenGL Training sample code fixes

2013-08-02 20:57:03 +00:00

_redirects.yaml

Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug: 10000221" into jb-mr2-docs

2013-08-01 22:36:03 +00: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

Doc change: Updated reference docs for Google Play Services 3.2.

2013-08-01 15:30:06 -07:00

googlef295f8c7d59b0d29.html

…

index.jd

Revert "docs: add link to developer survey on main landing pages"

2013-07-30 12:28:43 -07:00

legal.jd

…

license.jd

…

offline.jd

…

robots.txt

…

security_at_android_dot_com.txt

…

sitemap-intl.txt

…

sitemap.txt

update Getting Started class about fragments to remove support lib lesson

2013-07-30 16:29:09 -07:00

support.jd

Doc change: update support urls.

2013-04-22 16:37:01 -07:00