7950 Commits

Author SHA1 Message Date
Ricardo Cervera
1ae343a055 am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
* commit '3910b5d2f55b613191610905a4ae25aa3d3a1d15':
  docs: Fixed path for build output.
2014-09-30 14:56:02 +00:00
Ricardo Cervera
3910b5d2f5 am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
* commit '6ea34ddfde0aa3c60a83cc4fb7111514be97da9c':
  docs: Fixed path for build output.
2014-09-30 00:53:23 +00:00
Ricardo Cervera
6ea34ddfde am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
* commit '9f48394158bce2984a19fe504b7a7f1f673866f3':
  docs: Fixed path for build output.
2014-09-30 00:39:39 +00:00
Ricardo Cervera
9f48394158 am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
* commit '808440cd5e1052f21b937cdcb60acecefd57f23c':
  docs: Fixed path for build output.
2014-09-29 20:43:55 +00:00
Ricardo Cervera
808440cd5e Merge "docs: Fixed path for build output." into klp-modular-docs 2014-09-29 14:56:30 +00:00
Dirk Dougherty
ea416843e3 am 4ffdf9e7: am cdc49451: am 5913f406: am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs
* commit '4ffdf9e77571beb73fc11ceaffa0248eacbcd376':
  Doc change: Add new index page for games stories.
2014-09-27 05:30:27 +00:00
Dirk Dougherty
c2f4985e84 am cdc49451: am 5913f406: am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs
* commit 'cdc494512edb13c0405e1f4410439112e39102ae':
  Doc change: Add new index page for games stories.
2014-09-27 05:24:58 +00:00
Dirk Dougherty
cdc494512e am 5913f406: am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs
* commit '5913f40618494a361b4cc0c79aebdd2f0a9170da':
  Doc change: Add new index page for games stories.
2014-09-27 05:20:38 +00:00
Dirk Dougherty
5913f40618 am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs
* commit '6373718b883dd945c17987ac64925c0fdc30674d':
  Doc change: Add new index page for games stories.
2014-09-27 05:14:05 +00:00
Dirk Dougherty
6373718b88 Merge "Doc change: Add new index page for games stories." into klp-modular-docs 2014-09-27 03:16:53 +00:00
Dirk Dougherty
eb81afbe29 Doc change: Add new index page for games stories.
Change-Id: Icd9de0715c8a77333fd73a46f31c3ad81d0b951b
2014-09-26 17:43:14 -07:00
Ricardo Cervera
b9c000e090 docs: Fixed path for build output.
http://b.android.com/76374

Change-Id: I950174eba961e2bf31600671e438e2b85176a9d4
2014-09-26 13:25:02 -07:00
Dirk Dougherty
afbe165aec Doc change: Add IAB v2 deprecation notice.
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
2014-09-26 11:09:12 -07:00
Joe Fernandez
ec4697fad7 am a73fa92c: am 2c1ef532: am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit 'a73fa92c2e0bada989b9196425e179fcc5b8b0de':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
2014-09-24 22:04:34 +00:00
Joe Fernandez
a8f4252d2a am 2c1ef532: am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '2c1ef5328cee7059b1ab0d8de849c2fa474f88dd':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
2014-09-24 21:54:08 +00:00
Joe Fernandez
2c1ef5328c am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '1968b91937020e8aa826224642733bbb9055af2e':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
2014-09-24 15:56:02 +00:00
Joe Fernandez
1968b91937 am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit 'b8a60dada505d79341cfa4cc2b9906d892e8298b':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
2014-09-24 15:44:50 +00:00
Joe Fernandez
b8a60dada5 Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 2014-09-24 15:39:01 +00:00
Joe Fernandez
57024257e5 docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Change-Id: Iab735d07e705f019828d649e370fe5ef5006f305
2014-09-24 08:35:03 -07:00
Ricardo Cervera
f8975d794c am 72c7d337: am a4d80ca2: am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs
* commit '72c7d337472902a9fccdd3352982eeeec4c294bd':
  docs: Fixed Developer Tools image. Bug: 17609483
2014-09-23 03:27:43 +00:00
David Friedman
122425da60 am 1c68ba34: am 1695d3de: am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file.
* commit '1c68ba342cc5eb90f9f7a26fb13fa96ffe47bb0b':
  Fixes two typos, one in each file.
2014-09-23 03:27:37 +00:00
Ricardo Cervera
acc0d6de53 am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs
* commit '44737ea5e5a2f071ffc268f21556aa651a7637db':
  docs: Fixed Developer Tools image. Bug: 17609483
2014-09-23 03:06:54 +00:00
David Friedman
086956839a am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file.
* commit '8ec839c95cb0020ee84f23ba65c4c95fb39ebd20':
  Fixes two typos, one in each file.
2014-09-23 03:06:29 +00:00
Ricardo Cervera
44737ea5e5 am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs
* commit '4d0f84bb55957c0f5372b53fe94ddfb53c9d0cf8':
  docs: Fixed Developer Tools image. Bug: 17609483
2014-09-22 21:44:13 +00:00
Ricardo Cervera
4d0f84bb55 am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs
* commit '556f23aa1ae01832611e5e3b4059b47e6a7a00fb':
  docs: Fixed Developer Tools image. Bug: 17609483
2014-09-22 21:37:06 +00:00
Ricardo Cervera
556f23aa1a Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 2014-09-22 21:26:35 +00:00
David Friedman
8ec839c95c am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file.
* commit '6bacce4f24ca05fc95c38ea1e7df75dd176b81c2':
  Fixes two typos, one in each file.
2014-09-22 20:51:29 +00:00
David Friedman
6bacce4f24 am 8dcf1c32: Fixes two typos, one in each file.
* commit '8dcf1c32299e2c1c58c053925c572d58f2a74ee9':
  Fixes two typos, one in each file.
2014-09-22 20:41:17 +00:00
Ricardo Cervera
4af9fa4b23 docs: Fixed Developer Tools image. Bug: 17609483
Change-Id: I400713dfe5ca54da193dccf15dac117dc4e11ca2
2014-09-22 19:56:48 +00:00
David Friedman
8dcf1c3229 Fixes two typos, one in each file.
Change-Id: I5f4a9100d20f8ad50052d63dc106a030ac75b1b0
2014-09-22 10:24:41 -07:00
Dirk Dougherty
2e53fa54fa am 929e55eb: am 3b304e09: am 6357cd09: am 496cfbf7: Doc change: Add IAB v2 deprecation notice.
* commit '929e55eb75ce05fba6d704d520735f8ca4172ef0':
  Doc change: Add IAB v2 deprecation notice.
2014-09-18 05:08:43 +00:00
Dirk Dougherty
c55214a95c am 6357cd09: am 496cfbf7: Doc change: Add IAB v2 deprecation notice.
* commit '6357cd095abf105f2c62a4cba459e50f49cfd5c7':
  Doc change: Add IAB v2 deprecation notice.
2014-09-18 03:31:23 +00:00
Dirk Dougherty
6357cd095a am 496cfbf7: Doc change: Add IAB v2 deprecation notice.
* commit '496cfbf7a83e4c0f66ece27f36c2dc3d31994ff1':
  Doc change: Add IAB v2 deprecation notice.
2014-09-18 01:00:09 +00:00
Dirk Dougherty
496cfbf7a8 Doc change: Add IAB v2 deprecation notice.
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
2014-09-17 15:56:43 -07:00
Robert Ly
2df91b775a am 418cfad1: am 446bd890: am 4243ec2a: am 9efd9f60: am fc95c477: docs: edu changes for launch
* commit '418cfad1de153c161d6abc830dd762f939cab257':
  docs: edu changes for launch
2014-09-17 17:27:18 +00:00
Andrew Solovay
e8237c4da0 am 1e36696f: am 37fce2bc: am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
* commit '1e36696facbc54e90b69e44779fcf25052594139':
  Docs: Updated to include new Subscriptions functionality.
2014-09-17 17:27:07 +00:00
Robert Ly
5b75935416 am 4243ec2a: am 9efd9f60: am fc95c477: docs: edu changes for launch
* commit '4243ec2a84e9e42237e8e5bfd5cfb675f765d84f':
  docs: edu changes for launch
2014-09-17 17:10:01 +00:00
Andrew Solovay
b1c066fa5c am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
* commit '67267dcf909e080ea3adf902c8a9df115bd1b279':
  Docs: Updated to include new Subscriptions functionality.
2014-09-17 17:09:46 +00:00
Robert Ly
4243ec2a84 am 9efd9f60: am fc95c477: docs: edu changes for launch
* commit '9efd9f607006b3e02cda714901884e1ce22475d3':
  docs: edu changes for launch
2014-09-17 15:33:16 +00:00
Robert Ly
9efd9f6070 am fc95c477: docs: edu changes for launch
* commit 'fc95c477835f86d99cf8c7ce5c1dd098fa42e69c':
  docs: edu changes for launch
2014-09-17 15:19:15 +00:00
Robert Ly
fc95c47783 docs: edu changes for launch
Change-Id: Ia9047138bd9972e572b5dd93310339b630a2810d
2014-09-17 15:13:09 +00:00
Andrew Solovay
67267dcf90 am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
* commit '6c6664c95d7935398909e798e0aad451a2a83b1b':
  Docs: Updated to include new Subscriptions functionality.
2014-09-17 06:12:12 +00:00
Andrew Solovay
6c6664c95d am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
* commit 'a209406faa1f2b0f1dd7b6e3c5a468729f1c562f':
  Docs: Updated to include new Subscriptions functionality.
2014-09-17 06:01:09 +00:00
Andrew Solovay
a209406faa Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 2014-09-17 02:21:10 +00:00
Robert Ly
fbc0ac24a2 am f235c44c: am 8372379f: am 6641ddf6: am d00b110a: am e152b793: docs: remove fire and forget language from wear docs
* commit 'f235c44c842116db8c07a2cc6b2d943d9cd662c8':
  docs: remove fire and forget language from wear docs
2014-09-16 18:04:12 +00:00
Robert Ly
b84b1058d0 am 6641ddf6: am d00b110a: am e152b793: docs: remove fire and forget language from wear docs
* commit '6641ddf6711a7f521df6492db167598ec33d2487':
  docs: remove fire and forget language from wear docs
2014-09-16 16:24:17 +00:00
Robert Ly
6641ddf671 am d00b110a: am e152b793: docs: remove fire and forget language from wear docs
* commit 'd00b110a3b9991553806d196f1115a510a72210c':
  docs: remove fire and forget language from wear docs
2014-09-15 22:03:04 +00:00
Robert Ly
d00b110a3b am e152b793: docs: remove fire and forget language from wear docs
* commit 'e152b793e5f56ac9d73d0b3e3e191fea6b0ba1e5':
  docs: remove fire and forget language from wear docs
2014-09-15 19:27:18 +00:00
Robert Ly
e152b793e5 docs: remove fire and forget language from wear docs
Change-Id: I0a8d83ba0db24f1232d4c729f298c6af04c048b3
2014-09-15 10:46:23 -07:00
Joe Fernandez
efa4f1603d am b331a753: am 85c953ef: am 41b12f29: am 02480cbf: am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs
* commit 'b331a753235cc84390b0d574d2d586b5ced94872':
  docs: remove bad link in the quick view box for TV Recommendations #2
2014-09-13 02:37:24 +00:00