8429 Commits

Author SHA1 Message Date
Rich Slogar
4a6ddf5b64 am c9a5af5a: am aaafc8ec: am faac8b79: am c3d174a0: am 848d9125: am 1afa82dc: docs:remove sdk/ndk note
* commit 'c9a5af5a5dca4f293c44c0632c3fc4b4042e1c36':
  docs:remove  sdk/ndk note
2014-11-05 21:11:37 +00:00
Rich Slogar
c9a5af5a5d am aaafc8ec: am faac8b79: am c3d174a0: am 848d9125: am 1afa82dc: docs:remove sdk/ndk note
* commit 'aaafc8ec6701338246ec945bf861fec8ff56a832':
  docs:remove  sdk/ndk note
2014-11-05 21:02:46 +00:00
Rich Slogar
faac8b7983 am c3d174a0: am 848d9125: am 1afa82dc: docs:remove sdk/ndk note
* commit 'c3d174a0304d3be57e485c48783d7c101553c78a':
  docs:remove  sdk/ndk note
2014-11-05 20:50:03 +00:00
Ricardo Cervera
4739e17052 am 85ba0d92: am 0f288c6a: am caecc4ae: am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21
* commit '85ba0d929f4cd6651e5a288d5840b4ee5854e147':
  docs: Add instructions to attach debugger to a running process.
2014-11-05 20:15:37 +00:00
Ricardo Cervera
85ba0d929f am 0f288c6a: am caecc4ae: am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21
* commit '0f288c6a246e4d6841b13ca13132910192cdd22b':
  docs: Add instructions to attach debugger to a running process.
2014-11-05 19:06:36 +00:00
Ricardo Cervera
caecc4ae3d am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21
* commit 'df37d45f1311dcbfbcc58b3ff81f3df56c46fcdd':
  docs: Add instructions to attach debugger to a running process.
2014-11-05 18:54:12 +00:00
Rich Slogar
1afa82dce0 docs:remove sdk/ndk note
Change-Id: I3aaebdd14b0b26b041da3ee6872f84f311d4191b
2014-11-05 10:46:50 -08:00
Ricardo Cervera
58f1200c33 Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs 2014-11-05 17:00:10 +00:00
Ricardo Cervera
25a4e21e13 Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev 2014-11-05 16:58:23 +00:00
Eric Gilmore
66df2b1868 am 3cde7b98: am ffcc5657: am 9fe0017d: am 1c9860f9: am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
* commit '3cde7b9801660e6e539bbec123755be34caedecc':
  Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
2014-11-05 00:42:41 +00:00
Eric Gilmore
3cde7b9801 am ffcc5657: am 9fe0017d: am 1c9860f9: am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
* commit 'ffcc5657b9045435983ec1f981ea8890c423ba14':
  Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
2014-11-05 00:39:20 +00:00
Eric Gilmore
9fe0017dd1 am 1c9860f9: am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
* commit '1c9860f9285709cddff2e570a50e3afc66091135':
  Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
2014-11-05 00:26:49 +00:00
Eric Gilmore
bf78adb25e Adding 5.0 emulator image and removing older image.
2nd patch set includes low/high res. images.

Bug: 18026943

Change-Id: I102e5de616251e742c8e7b9cf1948be1cbbc4a1c
2014-11-04 15:01:24 -08:00
Scott Kennedy
0681b7f6ec am af8b1379: am 9f07eb35: am 50567bb1: am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
* commit 'af8b13791c1715a8406a66aa19d3a056c2227804':
  Fix a small typo in a variable name
2014-11-04 19:31:51 +00:00
Ricardo Cervera
461e4429ae am a1b62876: am 9433c87b: am aa743477: am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
* commit 'a1b628764e1ff9b15ac3cf707dc0ea40a369c3ab':
  docs: Fix the circularReveal example.
2014-11-04 19:31:45 +00:00
Scott Kennedy
af8b13791c am 9f07eb35: am 50567bb1: am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
* commit '9f07eb35037e1780d614d713aa8af80dee8d1ba6':
  Fix a small typo in a variable name
2014-11-04 19:26:25 +00:00
Ricardo Cervera
a1b628764e am 9433c87b: am aa743477: am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
* commit '9433c87b8aca36a4a8fee7de7ccb52c3b705da38':
  docs: Fix the circularReveal example.
2014-11-04 19:26:16 +00:00
Scott Kennedy
50567bb1f0 am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
* commit '4b28b1c3f579e285b9b030ea1612bf7cb0ef04e1':
  Fix a small typo in a variable name
2014-11-04 19:16:55 +00:00
Ricardo Cervera
aa74347713 am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
* commit 'c190e7ee015202b6bc2be08a3c874efaf42b779f':
  docs: Fix the circularReveal example.
2014-11-04 19:16:48 +00:00
Scott Kennedy
d78ce50372 Merge "Fix a small typo in a variable name" into lmp-docs 2014-11-04 18:01:28 +00:00
Ricardo Cervera
61f91724a9 Merge "docs: Fix the circularReveal example." into lmp-docs 2014-11-04 17:56:22 +00:00
David Friedman
ff348f7da1 am f2764dd4: am 5880c9c2: am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs automerge: 6666f34
* commit 'f2764dd42173939ac5fddf1d1b0b96083df0843a':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
2014-11-04 03:28:12 +00:00
David Friedman
f2764dd421 am 5880c9c2: am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs automerge: 6666f34
* commit '5880c9c269b21799683bd153d10b605c9f011506':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
2014-11-04 03:15:48 +00:00
Dirk Dougherty
4c148e91ea am 52973fa2: am 0b8ae553: am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1
* commit '52973fa234afcc32bda8e89de6a49e4012be50fa':
  Doc change: Tv doc updates for publishing in Google Play.
2014-11-04 02:28:08 +00:00
Dirk Dougherty
52973fa234 am 0b8ae553: am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1
* commit '0b8ae553e89e93f73de4fff6ca2c46745177ed9c':
  Doc change: Tv doc updates for publishing in Google Play.
2014-11-04 02:20:59 +00:00
David Friedman
6666f34c9b am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs
* commit 'e20e2b9a4863144633bb5ba9d7bedf7d0948c760':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
2014-11-04 01:34:05 +00:00
Dirk Dougherty
73e558664d am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play.
automerge: 45729a1

* commit '45729a10495ed828749a706066b69051512bf4f0':
  Doc change: Tv doc updates for publishing in Google Play.
2014-11-04 00:21:53 +00:00
David Friedman
a827de4e8b Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 2014-11-04 00:05:52 +00:00
Joe Fernandez
efa9f725e9 am 1c337a11: am 2cc032d5: am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
automerge: 554d4b1

* commit '554d4b123b27aabc9283dd92c122c3cf53b9670a':
  docs: Update Android Dashboard for November 2014
2014-11-03 22:48:27 +00:00
Joe Fernandez
554d4b123b am 1c337a11: am 2cc032d5: am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
* commit '1c337a11d724a2e745423c2918d45aae501c607c':
  docs: Update Android Dashboard for November 2014
2014-11-03 22:31:38 +00:00
Scott Kennedy
a593fa94fe Fix a small typo in a variable name
Change-Id: If431236bf6885b3b0ef2c967869320538222ee33
2014-11-03 22:22:09 +00:00
Dirk Dougherty
e1970f1258 Doc change: Tv doc updates for publishing in Google Play.
cherry-picked from Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888

Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888
2014-11-03 20:48:23 +00:00
Joe Fernandez
2cc032d5ea am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
* commit 'badfcbec48e6904316bec731e22c52bb7cca25fb':
  docs: Update Android Dashboard for November 2014
2014-11-03 19:57:46 +00:00
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