8236 Commits

Author SHA1 Message Date
Ricardo Cervera
e1e0e05a14 am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
* commit '957f45c328c9cbe9d1fb65dab6d342dc28a85954':
  docs: Provide direct link to Ubuntu troubleshooting.
2014-10-02 18:13:55 +00:00
Ricardo Cervera
957f45c328 am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
* commit '680092c5987e701043ff0fa0d2c5390e829412c0':
  docs: Provide direct link to Ubuntu troubleshooting.
2014-10-02 18:07:53 +00:00
Ricardo Cervera
680092c598 Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 2014-10-02 18:04:42 +00:00
Rich Slogar
8bf6af00ed am da5febdc: am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs
* commit 'da5febdcb24fd74feb1341a8b0deb92089388595':
  docs: Update for Android 23.0.4
2014-10-02 18:00:31 +00:00
Ricardo Cervera
4ffffb8e8c docs: Provide direct link to Ubuntu troubleshooting.
Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
2014-10-02 10:57:39 -07:00
Rich Slogar
da5febdcb2 am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs
* commit '74ce7413158607af6be2889d7392c2e904c9c210':
  docs: Update for Android 23.0.4
2014-10-02 17:53:38 +00:00
Rich Slogar
74ce741315 am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs
* commit 'b15cd5296675fac00e5517b89fc1263d59fbad65':
  docs: Update for Android 23.0.4
2014-10-02 17:44:43 +00:00
Rich Slogar
b15cd52966 am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs
* commit 'c074c3a4074791ae1270e3177e2299f31b9bb5a1':
  docs: Update for Android 23.0.4
2014-10-02 17:38:35 +00:00
Rich Slogar
c074c3a407 Merge "docs: Update for Android 23.0.4" into klp-modular-docs 2014-10-02 17:31:05 +00:00
Rich Slogar
f34d0e6903 docs: Update for Android 23.0.4
Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf
2014-10-02 10:19:17 -07:00
Newton Allen
408f7534ef am d84ce32b: Merge "Fix some documentation typos." into lmp-dev
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
  Fix some documentation typos.
2014-10-02 16:46:03 +00:00
Newton Allen
d84ce32bd2 Merge "Fix some documentation typos." into lmp-dev 2014-10-02 16:39:12 +00:00
smain@google.com
2b7d4b24a3 am 74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev
* commit '74c2ec3644101ce4cc96e11a851daf21bf35e174':
  fix confusing sentence https://memegen.googleplex.com/5524829602054144
2014-10-02 15:06:18 +00:00
smain@google.com
77c81df2a2 fix confusing sentence
https://memegen.googleplex.com/5524829602054144

Change-Id: I451c167bd1aedbde4b0e676f5f74a9dacb20fc10
2014-10-02 01:26:59 +00:00
kmccormick
ec1aa9f38e am 04e50c47: am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit '04e50c474ce5b6aa2e366bc057a29a16467a66bd':
  Doc update: Update preprod (staging) instructions.
2014-10-01 22:36:57 +00:00
Ricardo Cervera
d791d332b5 am 1ed09f9b: am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit '1ed09f9b5bd7073f1a574499461dfbd47669da09':
  docs: ADT beginner text fix
2014-10-01 22:34:53 +00:00
kmccormick
04e50c474c am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit 'd1ba4c13d0928d10c467bd7fd5992186925e1a5a':
  Doc update: Update preprod (staging) instructions.
2014-10-01 17:55:43 +00:00
kmccormick
d1ba4c13d0 am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit 'ae3bd63bc5ef8106a0d1c2ac15d872517bded5c3':
  Doc update: Update preprod (staging) instructions.
2014-10-01 17:25:38 +00:00
kmccormick
ae3bd63bc5 am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit 'a1572ffc6b8df1f0da637fdb93b949322fcb3637':
  Doc update: Update preprod (staging) instructions.
2014-10-01 17:08:13 +00:00
kmccormick
a1572ffc6b Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 2014-10-01 17:02:26 +00:00
Ricardo Cervera
1ed09f9b5b am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit 'e906b38b7e692d05cf57ce12aabcb103a9a8b775':
  docs: ADT beginner text fix
2014-10-01 03:15:45 +00:00
Ricardo Cervera
e906b38b7e am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit '781c988a767eabf9b1b03b4a74f21e3b687902b6':
  docs: ADT beginner text fix
2014-10-01 03:08:30 +00:00
Ricardo Cervera
781c988a76 am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit 'ae7b5dc49381e76c82cda928cc37a6a8b529da25':
  docs: ADT beginner text fix
2014-10-01 02:57:29 +00:00
Ricardo Cervera
ae7b5dc493 Merge "docs: ADT beginner text fix" into klp-modular-docs 2014-10-01 02:07:15 +00:00
Ricardo Cervera
571e918345 docs: ADT beginner text fix
Change-Id: I03cc08d5a4f12137a573c23d1ee07e048225c8f5
2014-09-30 15:07:16 -07:00
kmccormick
76ab6c6290 Doc update: Update preprod (staging) instructions.
Fix for:

b/17525318

Change-Id: Id93bd3e6e1fd5f203733121e3148cec8b24ab374
2014-09-30 12:24:40 -07:00
Scott Rowe
4fdded1a0b am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
* commit 'd1462247e05dab10d20372249e9a3ef7ef93fc2e':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-09-30 14:56:06 +00:00
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
Newton Allen
8f8a11b7fa Fix some documentation typos.
Change-Id: I747a0ade5c7b9c45d4465bf327952338bbc1cfaa
(cherry picked from commit 4465d1a03ee5fddc5987c19fc36b0bb79e19572f)
2014-09-30 02:52:26 +00:00
Scott Rowe
d1462247e0 am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
* commit '6287a65cca1d7efb8a265be5b51feca0f1e320f7':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-09-30 00:53:34 +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
Scott Rowe
6287a65cca am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
* commit '294d534787e139119d30eb7a5b4dd1532312018e':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-09-30 00:39:49 +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
Scott Rowe
294d534787 am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
* commit '9d20628b4beb38470d4f7d10193ac5a7cc558d41':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-09-29 22:53:15 +00:00
Scott Rowe
9d20628b4b docs: b/16044763 Update IAB docs to give notice of v2 turndown
Change-Id: I696c9b22707d34635ab65b392d90aa7406ab40d0
2014-09-29 15:11:46 -07: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
smain@google.com
19e884f220 make sdk download links use HTTPS
bug: 8033954

Change-Id: Idffbb31d397b765fc71ec034d30cc58d1423fdc9
2014-09-26 12:22:59 -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