106906 Commits

Author SHA1 Message Date
Dirk Dougherty
1b173c6d5d am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '0f5d1391f511380382b2cb91cf356d80854230b5':
  Doc change: add redirects for edu urls.
2013-05-15 07:37:59 -07:00
Dirk Dougherty
7b2fba2f4a am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
* commit '997d00428c420ba8c2175c7c2e28f14d54abd0b9':
  Doc change: updates to location landing.
2013-05-15 07:37:55 -07:00
Dirk Dougherty
0f5d1391f5 am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit 'b705986179b1bbda80c9281477a4d6b6b6d27e88':
  Doc change: add redirects for edu urls.
2013-05-15 07:35:52 -07:00
Dirk Dougherty
997d00428c am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
* commit 'aa0acfc8761fc8802879f90511b904061a523ed2':
  Doc change: updates to location landing.
2013-05-15 07:35:49 -07:00
Dirk Dougherty
b705986179 am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '2694897a3c20b79e3b28601ee43bcaefec827232':
  Doc change: add redirects for edu urls.
2013-05-15 07:33:18 -07:00
Dirk Dougherty
aa0acfc876 am 231e2474: Merge commit \'c3069c26\' into manualmerge
* commit '231e2474f283dc0a1962b45f1c16c5280a8937df':
  Doc change: updates to location landing.
2013-05-15 07:33:16 -07:00
Dirk Dougherty
2694897a3c am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '787cbb37d5cb2334af80d8da1b8fa4286e845eee':
  Doc change: add redirects for edu urls.
2013-05-15 07:32:03 -07:00
Dirk Dougherty
231e2474f2 Merge commit 'c3069c26' into manualmerge
Conflicts:
	docs/html/guide/topics/location/strategies.jd

Change-Id: If38621ee5e6266fb3a68aff710553dc68d07eb5b
2013-05-15 07:30:11 -07:00
Dirk Dougherty
787cbb37d5 am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '9a51dfd4e3e10411ede67743f85cdd510ba3eb90':
  Doc change: add redirects for edu urls.
2013-05-15 06:38:32 -07:00
Dirk Dougherty
c3069c2614 am 8d595130: Merge "Doc change: updates to location landing." into jb-mr1.1-docs
* commit '8d59513030cbc61c37aec2d2a2343a9bfc03ae2d':
  Doc change: updates to location landing.
2013-05-15 06:35:10 -07:00
Dirk Dougherty
9a51dfd4e3 Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs 2013-05-15 13:34:31 +00:00
Dirk Dougherty
8d59513030 Merge "Doc change: updates to location landing." into jb-mr1.1-docs 2013-05-15 13:33:06 +00:00
Dirk Dougherty
d14295cf0e Doc change: updates to location landing.
Change-Id: Id7862fd966d9e80bf23521620e964813ad9065a6
2013-05-15 06:31:48 -07:00
The Android Automerger
2b115da641 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-15 05:55:29 -07:00
Dirk Dougherty
11929a3b4a am 89d42cab: am 0163a180: am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
* commit '89d42cabcd8b2395474f30fc2d3ecf42a7c03681':
  Doc change: add files for edu content.
2013-05-15 05:39:26 -07:00
Dirk Dougherty
89d42cabcd am 0163a180: am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
* commit '0163a180510128142ed9f13bf0d5a7daa4bf6c30':
  Doc change: add files for edu content.
2013-05-15 05:37:14 -07:00
Dirk Dougherty
0163a18051 am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
* commit '8f13a2ad9f68ddb10388e86104868311e5ee2e29':
  Doc change: add files for edu content.
2013-05-15 05:35:25 -07:00
Dirk Dougherty
8f13a2ad9f am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
* commit 'c3727b78faf23f84a4888d96a0e21716ac0cecb7':
  Doc change: add files for edu content.
2013-05-15 05:28:14 -07:00
Dirk Dougherty
c3727b78fa am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
* commit '260f110fce5374fa2c4b2d1788a54b1fa5a04d0f':
  Doc change: add files for edu content.
2013-05-15 04:33:00 -07:00
Dirk Dougherty
260f110fce am 7929aafe: am 6402d93e: Doc change: add files for edu content.
* commit '7929aafeaf95b1531e471cfbe9b79acd6a783a23':
  Doc change: add files for edu content.
2013-05-15 04:29:16 -07:00
Dirk Dougherty
206a40720a Doc change: add redirects for edu urls.
Change-Id: Ic46047c99fe9b1902694d9ecdcea1c9c799ee611
2013-05-15 04:28:25 -07:00
Dirk Dougherty
7929aafeaf am 6402d93e: Doc change: add files for edu content.
* commit '6402d93ed8ff6712c0b9787188607e5a9b212602':
  Doc change: add files for edu content.
2013-05-15 04:24:49 -07:00
Dirk Dougherty
6402d93ed8 Doc change: add files for edu content.
Change-Id: I5187958d5bbbdd1117df5bcc9b553c06323fef8d
2013-05-15 04:17:19 -07:00
Dirk Dougherty
cac4bc3188 am 3cdce556: am e7ba7a29: am 6999e89f: am 63c15be8: am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
* commit '3cdce5568107490c09030fc380c0d4aba5d6388d':
  Doc change: update gms and gcm reference TOC.
2013-05-15 02:59:30 -07:00
Dirk Dougherty
3cdce55681 am e7ba7a29: am 6999e89f: am 63c15be8: am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
* commit 'e7ba7a29e81388f9293a90a730a4e9be84938f8b':
  Doc change: update gms and gcm reference TOC.
2013-05-15 02:57:23 -07:00
Dirk Dougherty
e7ba7a29e8 am 6999e89f: am 63c15be8: am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
* commit '6999e89fd30679e189fca2a1e46b0c06ece1aff7':
  Doc change: update gms and gcm reference TOC.
2013-05-15 02:55:07 -07:00
Dirk Dougherty
6999e89fd3 am 63c15be8: am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
* commit '63c15be8a9b12bbc487e48160623a5aae883255b':
  Doc change: update gms and gcm reference TOC.
2013-05-15 02:52:39 -07:00
Dirk Dougherty
63c15be8a9 am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
* commit 'f76a9d23db204734ac88a20a96fd87c0d4b63665':
  Doc change: update gms and gcm reference TOC.
2013-05-15 02:51:01 -07:00
Dirk Dougherty
f76a9d23db am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.
* commit '7ea00d91c1f3447168cafebe04a99462e5c25c32':
  Doc change: update gms and gcm reference TOC.
2013-05-15 02:49:13 -07:00
Scott Main
de94923e64 am 84fa53ab: am dab92bca: am 78d38908: am f2216fd0: am 527b7623: more search suggest tagging
* commit '84fa53abab928427fc730d246db15480ab1e21bb':
  more search suggest tagging
2013-05-15 02:47:51 -07:00
Dirk Dougherty
7ea00d91c1 am a38ca33d: Doc change: update gms and gcm reference TOC.
* commit 'a38ca33d17f40a0a67855b2ec1b5895a5157b851':
  Doc change: update gms and gcm reference TOC.
2013-05-15 02:47:04 -07:00
Scott Main
84fa53abab am dab92bca: am 78d38908: am f2216fd0: am 527b7623: more search suggest tagging
* commit 'dab92bca845018865e8e6f17906e890dd5e9698d':
  more search suggest tagging
2013-05-15 02:45:43 -07:00
Scott Main
dab92bca84 am 78d38908: am f2216fd0: am 527b7623: more search suggest tagging
* commit '78d38908c43f2af43347cb19d4712617041ea815':
  more search suggest tagging
2013-05-15 02:43:33 -07:00
Scott Main
78d38908c4 am f2216fd0: am 527b7623: more search suggest tagging
* commit 'f2216fd0af83ba648f2ea0662d25210137bf0da3':
  more search suggest tagging
2013-05-15 02:41:07 -07:00
Dirk Dougherty
a38ca33d17 Doc change: update gms and gcm reference TOC.
Change-Id: I24b9506c3111a744c26e0c6c2b94192402684c80
2013-05-15 02:40:55 -07:00
Scott Main
f2216fd0af am 527b7623: more search suggest tagging
* commit '527b762341ef96b3ecc99aa6aa3b8b7615311458':
  more search suggest tagging
2013-05-15 02:38:44 -07:00
Scott Main
527b762341 more search suggest tagging
Change-Id: I2cbed751c4b75547feb3e6dc3d4762be9bd944d3
2013-05-15 02:33:57 -07:00
Dirk Dougherty
2aa3ca5286 am e3c734ac: am c50a14a6: am 78aad359: am a964c856: am daaa01af: am dcc7efa3: am f895a806: Doc change: Reorganize structure of Google Services nav.
* commit 'e3c734ac01df424ad457794bd2cfefcf1bc11469':
  Doc change: Reorganize structure of Google Services nav.
2013-05-15 02:28:00 -07:00
Dirk Dougherty
e3c734ac01 am c50a14a6: am 78aad359: am a964c856: am daaa01af: am dcc7efa3: am f895a806: Doc change: Reorganize structure of Google Services nav.
* commit 'c50a14a66a3bc623ab0a48c94eae4b8dce8a340d':
  Doc change: Reorganize structure of Google Services nav.
2013-05-15 02:26:54 -07:00
Dirk Dougherty
c50a14a66a am 78aad359: am a964c856: am daaa01af: am dcc7efa3: am f895a806: Doc change: Reorganize structure of Google Services nav.
* commit '78aad359350d9bae842019737a3998a1d3a784c5':
  Doc change: Reorganize structure of Google Services nav.
2013-05-15 02:24:42 -07:00
Dirk Dougherty
78aad35935 am a964c856: am daaa01af: am dcc7efa3: am f895a806: Doc change: Reorganize structure of Google Services nav.
* commit 'a964c856d331b4ab7390cd911d1c873149152af2':
  Doc change: Reorganize structure of Google Services nav.
2013-05-15 02:22:23 -07:00
Dirk Dougherty
a964c856d3 am daaa01af: am dcc7efa3: am f895a806: Doc change: Reorganize structure of Google Services nav.
* commit 'daaa01af0e25ed524e118811840213d5114d3358':
  Doc change: Reorganize structure of Google Services nav.
2013-05-15 02:20:24 -07:00
Dirk Dougherty
daaa01af0e am dcc7efa3: am f895a806: Doc change: Reorganize structure of Google Services nav.
* commit 'dcc7efa3a2a323e1a046369ea83b7abf23be5e06':
  Doc change: Reorganize structure of Google Services nav.
2013-05-15 02:18:18 -07:00
Dirk Dougherty
dcc7efa3a2 am f895a806: Doc change: Reorganize structure of Google Services nav.
* commit 'f895a806adadfb42c98b5885e91adbe7b29d3452':
  Doc change: Reorganize structure of Google Services nav.
2013-05-15 02:17:13 -07:00
Dirk Dougherty
f895a806ad Doc change: Reorganize structure of Google Services nav.
Change-Id: Iad23e238fb501a700c2d7d6f736ae8c305810531
2013-05-15 02:12:55 -07:00
Scott Main
44608a2b36 am f3d6b661: am 2ae4ee6a: am 38922807: am 4a945f3f: am 0408ef96: am 8d254bd3: am c06cbc3d: Merge "add docs for new IDE installing guide, migration guide, tips docs, and download page" into jb-mr1.1-docs
* commit 'f3d6b66103705b46e09eb94cf2a83626cbd4727a':
  add docs for new IDE installing guide, migration guide, tips docs, and download page
2013-05-15 01:30:06 -07:00
Scott Main
f3d6b66103 am 2ae4ee6a: am 38922807: am 4a945f3f: am 0408ef96: am 8d254bd3: am c06cbc3d: Merge "add docs for new IDE installing guide, migration guide, tips docs, and download page" into jb-mr1.1-docs
* commit '2ae4ee6a3269080b6559c448fbfd2dffd277ae12':
  add docs for new IDE installing guide, migration guide, tips docs, and download page
2013-05-15 01:28:50 -07:00
Scott Main
2ae4ee6a32 am 38922807: am 4a945f3f: am 0408ef96: am 8d254bd3: am c06cbc3d: Merge "add docs for new IDE installing guide, migration guide, tips docs, and download page" into jb-mr1.1-docs
* commit '389228074a69cd42f97620e7a4bddc87f65a0c84':
  add docs for new IDE installing guide, migration guide, tips docs, and download page
2013-05-15 01:26:57 -07:00
Scott Main
389228074a am 4a945f3f: am 0408ef96: am 8d254bd3: am c06cbc3d: Merge "add docs for new IDE installing guide, migration guide, tips docs, and download page" into jb-mr1.1-docs
* commit '4a945f3f4d230520b55f08e813bf1d8b0b139713':
  add docs for new IDE installing guide, migration guide, tips docs, and download page
2013-05-15 01:24:39 -07:00
Scott Main
4a945f3f4d am 0408ef96: am 8d254bd3: am c06cbc3d: Merge "add docs for new IDE installing guide, migration guide, tips docs, and download page" into jb-mr1.1-docs
* commit '0408ef9660a16e1846bac2f14ce307f1926785af':
  add docs for new IDE installing guide, migration guide, tips docs, and download page
2013-05-15 01:00:37 -07:00