8641 Commits

Author SHA1 Message Date
Joe Fernandez
eff5efac21 Merge "docs: Update Android Dashboard for November 2014" into lmp-docs 2014-11-03 19:37:20 +00:00
Joe Fernandez
9dc852ac69 docs: Update Android Dashboard for November 2014
Change-Id: I42b4c58ebfe2b6f486c560d4ccf698d8064d1d39
2014-11-03 11:33:28 -08:00
Scott Rowe
b8291ef75c am c1c58b9a: am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs automerge: aa3be67
* commit 'c1c58b9a96c1c3e54244034be9c6745a4c7183c3':
  docs: b/18119632 isGame, b/18119595 banner
2014-11-03 17:42:20 +00:00
Scott Rowe
c1c58b9a96 am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs
automerge: aa3be67

* commit 'aa3be670328ee9ff7e1fbd3ec077ff27ddf42013':
  docs: b/18119632 isGame, b/18119595 banner
2014-11-03 17:29:59 +00:00
Ricardo Cervera
3e621914ca Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs 2014-11-03 17:27:09 +00:00
Scott Rowe
1117098b61 am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs
* commit 'd4e3825a83764f9692f833c73915c310f83e38eb':
  docs: b/18119632 isGame, b/18119595 banner
2014-11-03 17:22:26 +00:00
Scott Rowe
1b2cf3f8f6 am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs
* commit 'cd796536ce81fe6f8a63c3867b57e7b7f92a8542':
  docs: b/18119632 isGame, b/18119595 banner
2014-11-03 16:54:29 +00:00
Scott Rowe
cd796536ce Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 2014-11-03 16:24:38 +00:00
Scott Rowe
2042e40b96 am 201805a4: am 8d262c3a: am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs automerge: 4e439d0
* commit '201805a49f57edd576eb59eeb4eee3088841a101':
  docs: b/15180738 - invalid urls in badge generator
2014-11-01 17:51:42 +00:00
Nick Kralevich
f972e5a11b resolved conflicts for merge of ae59e01c to master
Change-Id: I0a29b44009ef05e8171b3a057996facca4114df0
2014-11-01 10:47:30 -07:00
Joe Fernandez
c05740018e am 12e76b99: am 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs automerge: a1caad9 automerge: c312071
* commit '12e76b995dafc167ad8eb96f3d25de5af33be1f6':
  docs:studio-updates-814v2
2014-11-01 17:41:11 +00:00
smain@google.com
a564f7bf94 am a004c2ec: am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page automerge: b2b3b37 automerge: 07c9807
* commit 'a004c2ec06a5ba3d65786e50171d8cdbb80515c8':
  revise helpouts tags to use just one on each page
2014-11-01 17:41:03 +00:00
Ricardo Cervera
158183c79a am fd8184e4: am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev automerge: 84a48b0 automerge: 721b1d3
* commit 'fd8184e4247f81f6027ae3cc328e8a19869c2d5e':
  docs: Add links to Wear UI training from Design pages.
2014-11-01 17:40:53 +00:00
Nick Kralevich
31a378efbf resolved conflicts for merge of 85118849 to master
Change-Id: Ic4d98e2804dddf3a7fe58bea99f0a4b22ebd605d
2014-11-01 10:35:47 -07:00
Scott Rowe
201805a49f am 8d262c3a: am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs
automerge: 4e439d0

* commit '4e439d0312b753b1162519baa473e5358c842069':
  docs: b/15180738 - invalid urls in badge generator
2014-11-01 16:54:34 +00:00
Scott Rowe
8d262c3a03 am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs
* commit '20ee9f122da1572ffb4e9a76eddc71180a4e608d':
  docs: b/15180738 - invalid urls in badge generator
2014-11-01 16:42:02 +00:00
Scott Rowe
de74098593 am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs
* commit 'aa275bf989f0bf9e968f0804bb57ec7b1a7c1f54':
  docs: b/15180738 - invalid urls in badge generator
2014-11-01 16:28:23 +00:00
Scott Rowe
aa275bf989 Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 2014-11-01 16:23:12 +00:00
Scott Rowe
e19bf40fad am dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs automerge: 0948545 automerge: c94ad35
automerge: 3d6f449

* commit '3d6f449cd24056ecfab4300ef55fb8e20919c631':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
2014-11-01 15:23:29 +00:00
David Friedman
5916862108 am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985 automerge: cc7917d automerge: 4fc0aac
automerge: ae4297e

* commit 'ae4297e2ef5e0713ecf78112b57b97444f20c818':
  Fixes wrongly nested braces. Bug: 17499985
2014-11-01 15:20:46 +00:00
Joe Fernandez
ae59e01ccc am 84045506: am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references automerge: f16f6d9
automerge: 93a954b

* commit '93a954b46b1d07bf1ca50790a62893f7bc123aeb':
  docs: multidex - building apps with over 65K method references
2014-11-01 15:03:56 +00:00
Joe Fernandez
12e76b995d am 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs automerge: a1caad9
automerge: c312071

* commit 'c312071f4eab1906aab01ec91fdc65b84d57913f':
  docs:studio-updates-814v2
2014-11-01 15:03:02 +00:00
smain@google.com
a004c2ec06 am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page automerge: b2b3b37
automerge: 07c9807

* commit '07c98070fbd571e7b275ad54c3c918dd7c48d2cc':
  revise helpouts tags to use just one on each page
2014-11-01 15:01:09 +00:00
Ricardo Cervera
fd8184e424 am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev automerge: 84a48b0
automerge: 721b1d3

* commit '721b1d383f44caedcada436bed0db5e9d6b672e1':
  docs: Add links to Wear UI training from Design pages.
2014-11-01 14:59:06 +00:00
Joe Fernandez
8511884919 am 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs automerge: ed47742
automerge: 05827eb

* commit '05827eb8f77e26da75c09fbdb84bfb184f8667fd':
  docs:studio-update-814
2014-11-01 14:58:06 +00:00
Scott Rowe
3d6f449cd2 am dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs automerge: 0948545
automerge: c94ad35

* commit 'c94ad35b4a37d5b2646a0ab6792c0815dcebf522':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
2014-11-01 14:55:58 +00:00
David Friedman
ae4297e2ef am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985 automerge: cc7917d
automerge: 4fc0aac

* commit '4fc0aacb1add76df5fde2c9b24f96f8bc3e9dc1d':
  Fixes wrongly nested braces. Bug: 17499985
2014-11-01 14:54:06 +00:00
Joe Fernandez
f16f6d9ed2 am 84045506: am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references
* commit '84045506140d895aaf4fdc5a090e89d657add120':
  docs: multidex - building apps with over 65K method references
2014-11-01 14:10:43 +00:00
Joe Fernandez
a1caad91c7 am 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs
* commit '0e4ef673696c0a2c352379b325ed281478512da3':
  docs:studio-updates-814v2
2014-11-01 14:09:34 +00:00
smain@google.com
b2b3b37e2f am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page
* commit '9b00d795d18b8a52b54f919e53b094e689bfc92e':
  revise helpouts tags to use just one on each page
2014-11-01 14:09:05 +00:00
Ricardo Cervera
84a48b0a4a am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev
* commit '84ca5ddb0844146408e241e7022c78477d9c4a6f':
  docs: Add links to Wear UI training from Design pages.
2014-11-01 14:08:31 +00:00
Joe Fernandez
ed47742ff0 am 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs
* commit '43fda072c227e7a98dbcb993dc20fb391c1f11fc':
  docs:studio-update-814
2014-11-01 14:08:18 +00:00
Scott Rowe
0948545e30 am dfeb6055: am b31c2b07: am 397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs
* commit 'dfeb60558e87879c9575b32281e9c22fec623198':
  docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
2014-11-01 14:07:41 +00:00
David Friedman
cc7917d0ee am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985
* commit '62b532c7f4d7e6a868b8b007829dab9622ee5423':
  Fixes wrongly nested braces. Bug: 17499985
2014-11-01 14:07:19 +00:00
Joe Fernandez
20207a83c9 am e8ad737d: docs: multidex - building apps with over 65K method references
* commit 'e8ad737db6b35bfe342dc0a1674f1200d08e45f5':
  docs: multidex - building apps with over 65K method references
2014-11-01 01:14:15 +00:00
Joe Fernandez
e8ad737db6 docs: multidex - building apps with over 65K method references
Change-Id: I822cdc54d0f2df34a89d5294ff7ea1f5f83b25f9
2014-10-31 17:38:49 -07:00
Rich Slogar
848f688145 Merge "docs: navigation and download updates" 2014-11-01 00:32:11 +00:00
Dirk Dougherty
e129d338da Add Nexus 6 and Nexus 9 to the device framer.
Change-Id: I7e66642429497921e20bad9065dbe5e56e952028
2014-10-31 23:31:41 +00:00
Scott Rowe
067fbaa8e3 docs: b/15180738 - invalid urls in badge generator
Change-Id: Ifb7ab1ad1b860c7fb7faec624b7d3ad4244fee36
2014-10-31 14:52:32 -07:00
Joe Fernandez
89e73a1c85 am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs
* commit 'ea17fdecae470beeae8e12666254bf8f6446b06e':
  docs:studio-updates-814v2
2014-10-31 19:28:30 +00:00
Joe Fernandez
ea17fdecae Merge "docs:studio-updates-814v2" into lmp-docs 2014-10-31 19:23:46 +00:00
Rich Slogar
62fddcd9d9 docs:studio-updates-814v2
Change-Id: I68f6fb1e40e5b7bbdf25e6ab1340d02116452a02
2014-10-31 12:21:48 -07:00
Yorke Lee
45d7d17c44 am 14deca6d: am a27afde3: Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev automerge: 2eaf0b0
* commit '14deca6ded51438439680eebf6d87f5191122e5b':
  Fix typo in activity_testing.jd
2014-10-31 18:50:50 +00:00
Yorke Lee
14deca6ded am a27afde3: Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev
automerge: 2eaf0b0

* commit '2eaf0b0a7b86304a739f91033e9f8f053123e74d':
  Fix typo in activity_testing.jd
2014-10-31 18:45:18 +00:00
Yorke Lee
a27afde31a Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev 2014-10-31 18:25:45 +00:00
smain@google.com
26bf2f7b87 revise helpouts tags to use just one on each page
Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
2014-10-31 17:51:41 +00:00
smain@google.com
0da6b005c1 revise helpouts tags to use just one on each page
Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
2014-10-31 10:45:23 -07:00
Scott Rowe
4c3a07ba05 docs: b/18119632 isGame, b/18119595 banner
Change-Id: I171b4aff3359ec96b2ea1003870739ad586971c7
2014-10-31 09:51:27 -07:00
Ricardo Cervera
bdb1cf0c1b Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev 2014-10-31 15:16:05 +00:00
Joe Fernandez
81fcc85c23 Merge "docs:studio-update-814" into lmp-docs 2014-10-31 05:18:43 +00:00